diff options
author | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-25 12:45:49 -0400 |
commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /include/asm-arm/cpu-single.h | |
parent | d0d59b98d7a0b3801ce03e695ba885b698a6d122 (diff) | |
parent | 9c2c38a122cc23d6a09b8004d60a33913683eedf (diff) |
Merge HEAD from ../from-linus
Diffstat (limited to 'include/asm-arm/cpu-single.h')
-rw-r--r-- | include/asm-arm/cpu-single.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/cpu-single.h b/include/asm-arm/cpu-single.h index b5ec5d54665d..6723e67244fa 100644 --- a/include/asm-arm/cpu-single.h +++ b/include/asm-arm/cpu-single.h | |||
@@ -41,4 +41,4 @@ extern int cpu_do_idle(void); | |||
41 | extern void cpu_dcache_clean_area(void *, int); | 41 | extern void cpu_dcache_clean_area(void *, int); |
42 | extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm); | 42 | extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm); |
43 | extern void cpu_set_pte(pte_t *ptep, pte_t pte); | 43 | extern void cpu_set_pte(pte_t *ptep, pte_t pte); |
44 | extern volatile void cpu_reset(unsigned long addr); | 44 | extern void cpu_reset(unsigned long addr) __attribute__((noreturn)); |