History

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

Linus Torvalds committed 20 years ago

Commit 48ea7532 parents 7c3dbbe dc86e887 files · +39 −15Browse files

Showing the changes to include (2 of 7 files). Show all

Unified · Split

2 files
  1. include/asm-ia64/delay.h +1 −9
  2. include/linux/cache.h +1 −1
include/asm-ia64/delay.h+1−9
@@ -84,14 +84,6 @@ __delay (unsigned long loops) · 83 unmodified lines
8484 ia64_delay_loop (loops - 1);
8585 }
8686
87−static __inline__ void
88−udelay (unsigned long usecs)
89−{
90− unsigned long start = ia64_get_itc();
91− unsigned long cycles = usecs*local_cpu_data->cyc_per_usec;
92−
93− while (ia64_get_itc() - start < cycles)
94− cpu_relax();
95−}
87+extern void udelay (unsigned long usecs);
9688
9789 #endif /* _ASM_IA64_DELAY_H */
include/linux/cache.h+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #define SMP_CACHE_BYTES L1_CACHE_BYTES
1414 #endif
1515
16−#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
16+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
1717 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
1818 #else
1919 #define __read_mostly