projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[linux-2.6-block.git]
/
include
/
linux
/
percpu.h
diff --git
a/include/linux/percpu.h
b/include/linux/percpu.h
index b72be2f79e6a3d8d6b5c14aac33127e7544ab35b..926adaae0f9610885d5d64e341410a9b96900312 100644
(file)
--- a/
include/linux/percpu.h
+++ b/
include/linux/percpu.h
@@
-1,7
+1,7
@@
#ifndef __LINUX_PERCPU_H
#define __LINUX_PERCPU_H
-#include <linux/
spinlock.h> /* For preempt_disable() */
+#include <linux/
preempt.h>
#include <linux/slab.h> /* For kmalloc() */
#include <linux/smp.h>
#include <linux/string.h> /* For memset() */