diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /arch/arm/mm/proc-macros.S | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 7cfc2604a1ee..9e2c89eb2115 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S | |||
| @@ -49,3 +49,13 @@ | |||
| 49 | .macro asid, rd, rn | 49 | .macro asid, rd, rn |
| 50 | and \rd, \rn, #255 | 50 | and \rd, \rn, #255 |
| 51 | .endm | 51 | .endm |
| 52 | |||
| 53 | .macro crval, clear, mmuset, ucset | ||
| 54 | #ifdef CONFIG_MMU | ||
| 55 | .word \clear | ||
| 56 | .word \mmuset | ||
| 57 | #else | ||
| 58 | .word \clear | ||
| 59 | .word \ucset | ||
| 60 | #endif | ||
| 61 | .endm | ||