OSDN > ソフトウェアを探す > Linux Kernel Documents > SCM > git > linux-2.4.36 > コミット

Linux Kernel Documents
Fork
linux-2.6
linux-2.4.36

linux-2.4.36: コミット

2.4.36-stable kernel tree

Revert "[PATCH] MIPS: fix long long cast in pte macro"

The commit was bogus, it contained both the MIPS and the i386
fixes.

This reverts 5f81c2baacdb36638446d1356beb4ce4e13baedb commit.

--- a/include/asm-i386/page.h

+++ b/include/asm-i386/page.h

		@@ -41,13 +41,11 @@ typedef struct { unsigned long pte_low, pte_high; } pte_t;
41	41	typedef struct { unsigned long long pmd; } pmd_t;
42	42	typedef struct { unsigned long long pgd; } pgd_t;
43	43	#define pte_val(x) ((x).pte_low \| ((unsigned long long)(x).pte_high << 32))
44		-#define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
45	44	#else
46	45	typedef struct { unsigned long pte_low; } pte_t;
47	46	typedef struct { unsigned long pmd; } pmd_t;
48	47	typedef struct { unsigned long pgd; } pgd_t;
49	48	#define pte_val(x) ((x).pte_low)
50		-#define __pte(x) ((pte_t) { (x) } )
51	49	#endif
52	50	#define PTE_MASK PAGE_MASK
53	51

		@@ -57,6 +55,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
57	55	#define pgd_val(x) ((x).pgd)
58	56	#define pgprot_val(x) ((x).pgprot)
59	57
	58	+#define __pte(x) ((pte_t) { (x) } )
60	59	#define __pmd(x) ((pmd_t) { (x) } )
61	60	#define __pgd(x) ((pgd_t) { (x) } )
62	61	#define __pgprot(x) ((pgprot_t) { (x) } )

--- a/include/asm-mips/page.h

+++ b/include/asm-mips/page.h

		@@ -77,16 +77,13 @@ static inline void copy_user_page(void * to, void * from, unsigned long vaddr)
77	77	#ifdef CONFIG_CPU_MIPS32
78	78	typedef struct { unsigned long pte_low, pte_high; } pte_t;
79	79	#define pte_val(x) ((x).pte_low \| ((unsigned long long)(x).pte_high << 32))
80		- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
81	80	#else
82	81	typedef struct { unsigned long long pte_low; } pte_t;
83	82	#define pte_val(x) ((x).pte_low)
84		- #define __pte(x) ((pte_t) { (x) } )
85	83	#endif
86	84	#else
87	85	typedef struct { unsigned long pte_low; } pte_t;
88	86	#define pte_val(x) ((x).pte_low)
89		-#define __pte(x) ((pte_t) { (x) } )
90	87	#endif
91	88
92	89	typedef struct { unsigned long pmd; } pmd_t;

		@@ -99,6 +96,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
99	96
100	97	#define ptep_buddy(x) ((pte_t *)((unsigned long)(x) ^ sizeof(pte_t)))
101	98
	99	+#define __pte(x) ((pte_t) { (x) } )
102	100	#define __pmd(x) ((pmd_t) { (x) } )
103	101	#define __pgd(x) ((pgd_t) { (x) } )
104	102	#define __pgprot(x) ((pgprot_t) { (x) } )