diff options
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/delay.h | 4 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6d122de88693..00e5955014ab 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -187,6 +187,9 @@ config ARM_L1_CACHE_SHIFT_6 help Setting ARM L1 cache line size to 64 Bytes. +config ARCH_PROVIDES_UDELAY + bool + config VECTORS_BASE hex default 0xffff0000 if MMU || CPU_HIGH_VECTOR diff --git a/arch/arm/include/asm/delay.h b/arch/arm/include/asm/delay.h index b2deda181549..57f1fa0e983b 100644 --- a/arch/arm/include/asm/delay.h +++ b/arch/arm/include/asm/delay.h @@ -8,6 +8,9 @@ #include <asm/param.h> /* HZ */ +#ifdef CONFIG_ARCH_PROVIDES_UDELAY +#include <mach/delay.h> +#else extern void __delay(int loops); /* @@ -40,5 +43,6 @@ extern void __const_udelay(unsigned long); __const_udelay((n) * ((2199023U*HZ)>>11))) : \ __udelay(n)) +#endif /* defined(ARCH_PROVIDES_UDELAY) */ #endif /* defined(_ARM_DELAY_H) */ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 59ff42ddf0ae..68b10b684e83 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -6,7 +6,7 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ csumpartialcopy.o csumpartialcopyuser.o clearbit.o \ - delay.o findbit.o memchr.o memcpy.o \ + findbit.o memchr.o memcpy.o \ memmove.o memset.o memzero.o setbit.o \ strncpy_from_user.o strnlen_user.o \ strchr.o strrchr.o \ @@ -17,6 +17,10 @@ lib-y := backtrace.o changebit.o csumipv6.o csumpartial.o \ mmu-y := clear_user.o copy_page.o getuser.o putuser.o +ifneq ($(CONFIG_ARCH_PROVIDES_UDELAY),y) + lib-y += delay.o +endif + # the code in uaccess.S is not preemption safe and # probably faster on ARMv3 only ifeq ($(CONFIG_PREEMPT),y) |