Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Use "is_power_of_2" macro for simplicity.
[SPARC]: Remove duplicate includes.

Linus Torvalds 18 years ago a90fcf31 c5b875e3

+2 -9

7 changed files

expand all

arch

sparc

kernel

irq.c

sparc64

kernel

ds.c

module.c

sys_sparc32.c

sys_sunos32.c

time.c

include

asm-sparc64

vio.h

-1

arch/sparc/kernel/irq.c

··· 18 18 #include <linux/linkage.h> 19 19 #include <linux/kernel_stat.h> 20 20 #include <linux/signal.h> 21 - #include <linux/sched.h> 22 21 #include <linux/interrupt.h> 23 22 #include <linux/slab.h> 24 23 #include <linux/random.h>

-1

arch/sparc64/kernel/ds.c

··· 6 6 #include <linux/kernel.h> 7 7 #include <linux/module.h> 8 8 #include <linux/types.h> 9 - #include <linux/module.h> 10 9 #include <linux/string.h> 11 10 #include <linux/slab.h> 12 11 #include <linux/sched.h>

-1

arch/sparc64/kernel/module.c

··· 11 11 #include <linux/fs.h> 12 12 #include <linux/string.h> 13 13 #include <linux/slab.h> 14 - #include <linux/vmalloc.h> 15 14 #include <linux/mm.h> 16 15 17 16 #include <asm/processor.h>

-1

arch/sparc64/kernel/sys_sparc32.c

··· 51 51 #include <linux/vfs.h> 52 52 #include <linux/netfilter_ipv4/ip_tables.h> 53 53 #include <linux/ptrace.h> 54 - #include <linux/highuid.h> 55 54 56 55 #include <asm/types.h> 57 56 #include <asm/uaccess.h>

-1

arch/sparc64/kernel/sys_sunos32.c

··· 57 57 #include <linux/personality.h> 58 58 59 59 /* For SOCKET_I */ 60 - #include <linux/socket.h> 61 60 #include <net/sock.h> 62 61 #include <net/compat.h> 63 62

-2

arch/sparc64/kernel/time.c

··· 28 28 #include <linux/jiffies.h> 29 29 #include <linux/cpufreq.h> 30 30 #include <linux/percpu.h> 31 - #include <linux/profile.h> 32 31 #include <linux/miscdevice.h> 33 32 #include <linux/rtc.h> 34 33 #include <linux/kernel_stat.h> ··· 46 47 #include <asm/sections.h> 47 48 #include <asm/cpudata.h> 48 49 #include <asm/uaccess.h> 49 - #include <asm/prom.h> 50 50 #include <asm/irq_regs.h> 51 51 52 52 DEFINE_SPINLOCK(mostek_lock);

+2 -2

include/asm-sparc64/vio.h

··· 8 8 #include <linux/spinlock.h> 9 9 #include <linux/completion.h> 10 10 #include <linux/list.h> 11 + #include <linux/log2.h> 11 12 12 13 #include <asm/ldc.h> 13 14 #include <asm/mdesc.h> ··· 258 257 static inline u32 vio_dring_avail(struct vio_dring_state *dr, 259 258 unsigned int ring_size) 260 259 { 261 - /* Ensure build-time power-of-2. */ 262 - BUILD_BUG_ON(ring_size & (ring_size - 1)); 260 + BUILD_BUG_ON(!is_power_of_2(ring_size)); 263 261 264 262 return (dr->pending - 265 263 ((dr->prod - dr->cons) & (ring_size - 1)));