• R/O
  • HTTP
  • SSH
  • HTTPS

linux-2.4.36: コミット

2.4.36-stable kernel tree


コミットメタ情報

リビジョン4bfbd8cfd48a451b543215f5bc1b48edad0c4df2 (tree)
日時2006-10-03 05:05:56
作者Willy Tarreau <w@1wt....>
コミッターWilly Tarreau

ログメッセージ

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;
4141 typedef struct { unsigned long long pmd; } pmd_t;
4242 typedef struct { unsigned long long pgd; } pgd_t;
4343 #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; })
4544 #else
4645 typedef struct { unsigned long pte_low; } pte_t;
4746 typedef struct { unsigned long pmd; } pmd_t;
4847 typedef struct { unsigned long pgd; } pgd_t;
4948 #define pte_val(x) ((x).pte_low)
50-#define __pte(x) ((pte_t) { (x) } )
5149 #endif
5250 #define PTE_MASK PAGE_MASK
5351
@@ -57,6 +55,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
5755 #define pgd_val(x) ((x).pgd)
5856 #define pgprot_val(x) ((x).pgprot)
5957
58+#define __pte(x) ((pte_t) { (x) } )
6059 #define __pmd(x) ((pmd_t) { (x) } )
6160 #define __pgd(x) ((pgd_t) { (x) } )
6261 #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)
7777 #ifdef CONFIG_CPU_MIPS32
7878 typedef struct { unsigned long pte_low, pte_high; } pte_t;
7979 #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; })
8180 #else
8281 typedef struct { unsigned long long pte_low; } pte_t;
8382 #define pte_val(x) ((x).pte_low)
84- #define __pte(x) ((pte_t) { (x) } )
8583 #endif
8684 #else
8785 typedef struct { unsigned long pte_low; } pte_t;
8886 #define pte_val(x) ((x).pte_low)
89-#define __pte(x) ((pte_t) { (x) } )
9087 #endif
9188
9289 typedef struct { unsigned long pmd; } pmd_t;
@@ -99,6 +96,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
9996
10097 #define ptep_buddy(x) ((pte_t *)((unsigned long)(x) ^ sizeof(pte_t)))
10198
99+#define __pte(x) ((pte_t) { (x) } )
102100 #define __pmd(x) ((pmd_t) { (x) } )
103101 #define __pgd(x) ((pgd_t) { (x) } )
104102 #define __pgprot(x) ((pgprot_t) { (x) } )
旧リポジトリブラウザで表示