forked from luck/tmp_suning_uos_patched
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* '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.
This commit is contained in:
commit
a90fcf3111
@ -18,7 +18,6 @@
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/kernel_stat.h>
|
||||
#include <linux/signal.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/random.h>
|
||||
|
@ -6,7 +6,6 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sched.h>
|
||||
|
@ -11,7 +11,6 @@
|
||||
#include <linux/fs.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/mm.h>
|
||||
|
||||
#include <asm/processor.h>
|
||||
|
@ -51,7 +51,6 @@
|
||||
#include <linux/vfs.h>
|
||||
#include <linux/netfilter_ipv4/ip_tables.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/highuid.h>
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
@ -57,7 +57,6 @@
|
||||
#include <linux/personality.h>
|
||||
|
||||
/* For SOCKET_I */
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/compat.h>
|
||||
|
||||
|
@ -28,7 +28,6 @@
|
||||
#include <linux/jiffies.h>
|
||||
#include <linux/cpufreq.h>
|
||||
#include <linux/percpu.h>
|
||||
#include <linux/profile.h>
|
||||
#include <linux/miscdevice.h>
|
||||
#include <linux/rtc.h>
|
||||
#include <linux/kernel_stat.h>
|
||||
@ -47,7 +46,6 @@
|
||||
#include <asm/sections.h>
|
||||
#include <asm/cpudata.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/irq_regs.h>
|
||||
|
||||
DEFINE_SPINLOCK(mostek_lock);
|
||||
|
@ -8,6 +8,7 @@
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/completion.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/log2.h>
|
||||
|
||||
#include <asm/ldc.h>
|
||||
#include <asm/mdesc.h>
|
||||
@ -257,8 +258,7 @@ static inline void *vio_dring_entry(struct vio_dring_state *dr,
|
||||
static inline u32 vio_dring_avail(struct vio_dring_state *dr,
|
||||
unsigned int ring_size)
|
||||
{
|
||||
/* Ensure build-time power-of-2. */
|
||||
BUILD_BUG_ON(ring_size & (ring_size - 1));
|
||||
BUILD_BUG_ON(!is_power_of_2(ring_size));
|
||||
|
||||
return (dr->pending -
|
||||
((dr->prod - dr->cons) & (ring_size - 1)));
|
||||
|
Loading…
Reference in New Issue
Block a user