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
84 ia64_delay_loop (loops - 1);84 ia64_delay_loop (loops - 1);
85}85}
86 86
87static __inline__ void87extern void udelay (unsigned long usecs);
88udelay (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}
96 88
97#endif /* _ASM_IA64_DELAY_H */89#endif /* _ASM_IA64_DELAY_H */
include/linux/cache.h+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
13#define SMP_CACHE_BYTES L1_CACHE_BYTES13#define SMP_CACHE_BYTES L1_CACHE_BYTES
14#endif14#endif
15 15
16#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)16#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
17#define __read_mostly __attribute__((__section__(".data.read_mostly")))17#define __read_mostly __attribute__((__section__(".data.read_mostly")))
18#else18#else
19#define __read_mostly19#define __read_mostly