diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-31 13:51:57 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-31 13:51:57 -0500 |
| commit | c7fb577e2a6cb04732541f2dc402bd46747f7558 (patch) | |
| tree | df3b1a1922ed13bfbcc45d08650c38beeb1a7bd1 /include/asm-ppc64/page.h | |
| parent | 9cec58dc138d6fcad9f447a19c8ff69f6540e667 (diff) | |
| parent | 581c1b14394aee60aff46ea67d05483261ed6527 (diff) | |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ppc64/page.h')
| -rw-r--r-- | include/asm-ppc64/page.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h index a15422bcf30d..d404431f0a9a 100644 --- a/include/asm-ppc64/page.h +++ b/include/asm-ppc64/page.h | |||
| @@ -11,13 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | 13 | #include <linux/config.h> |
| 14 | 14 | #include <asm/ppc_asm.h> /* for ASM_CONST */ | |
| 15 | #ifdef __ASSEMBLY__ | ||
| 16 | #define ASM_CONST(x) x | ||
| 17 | #else | ||
| 18 | #define __ASM_CONST(x) x##UL | ||
| 19 | #define ASM_CONST(x) __ASM_CONST(x) | ||
| 20 | #endif | ||
| 21 | 15 | ||
| 22 | /* PAGE_SHIFT determines the page size */ | 16 | /* PAGE_SHIFT determines the page size */ |
| 23 | #define PAGE_SHIFT 12 | 17 | #define PAGE_SHIFT 12 |