diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/spinlock.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/spinlock.h')
| -rw-r--r-- | include/linux/spinlock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index f8854655860e..0b22d51258e6 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/preempt.h> | 50 | #include <linux/preempt.h> |
| 51 | #include <linux/linkage.h> | 51 | #include <linux/linkage.h> |
| 52 | #include <linux/compiler.h> | 52 | #include <linux/compiler.h> |
| 53 | #include <linux/irqflags.h> | ||
| 53 | #include <linux/thread_info.h> | 54 | #include <linux/thread_info.h> |
| 54 | #include <linux/kernel.h> | 55 | #include <linux/kernel.h> |
| 55 | #include <linux/stringify.h> | 56 | #include <linux/stringify.h> |
| @@ -80,7 +81,7 @@ | |||
| 80 | #include <linux/spinlock_types.h> | 81 | #include <linux/spinlock_types.h> |
| 81 | 82 | ||
| 82 | /* | 83 | /* |
| 83 | * Pull the arch_spin*() functions/declarations (UP-nondebug doesnt need them): | 84 | * Pull the arch_spin*() functions/declarations (UP-nondebug doesn't need them): |
| 84 | */ | 85 | */ |
| 85 | #ifdef CONFIG_SMP | 86 | #ifdef CONFIG_SMP |
| 86 | # include <asm/spinlock.h> | 87 | # include <asm/spinlock.h> |