diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/asm-arm/page.h | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/page.h')
| -rw-r--r-- | include/asm-arm/page.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 416320d95419..a404d2bf0c68 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | * v4wb - ARMv4 with writeback cache, without minicache | 40 | * v4wb - ARMv4 with writeback cache, without minicache |
| 41 | * v4_mc - ARMv4 with minicache | 41 | * v4_mc - ARMv4 with minicache |
| 42 | * xscale - Xscale | 42 | * xscale - Xscale |
| 43 | * xsc3 - XScalev3 | ||
| 43 | */ | 44 | */ |
| 44 | #undef _USER | 45 | #undef _USER |
| 45 | #undef MULTI_USER | 46 | #undef MULTI_USER |
| @@ -84,6 +85,14 @@ | |||
| 84 | # endif | 85 | # endif |
| 85 | #endif | 86 | #endif |
| 86 | 87 | ||
| 88 | #ifdef CONFIG_CPU_XSC3 | ||
| 89 | # ifdef _USER | ||
| 90 | # define MULTI_USER 1 | ||
| 91 | # else | ||
| 92 | # define _USER xsc3_mc | ||
| 93 | # endif | ||
| 94 | #endif | ||
| 95 | |||
| 87 | #ifdef CONFIG_CPU_COPY_V6 | 96 | #ifdef CONFIG_CPU_COPY_V6 |
| 88 | # define MULTI_USER 1 | 97 | # define MULTI_USER 1 |
| 89 | #endif | 98 | #endif |