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 /arch/xtensa/include/asm/bitops.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 'arch/xtensa/include/asm/bitops.h')
| -rw-r--r-- | arch/xtensa/include/asm/bitops.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h index 6c3930397bd3..c8fac8d8190d 100644 --- a/arch/xtensa/include/asm/bitops.h +++ b/arch/xtensa/include/asm/bitops.h | |||
| @@ -106,7 +106,7 @@ static inline unsigned long __fls(unsigned long word) | |||
| 106 | 106 | ||
| 107 | #include <asm-generic/bitops/fls64.h> | 107 | #include <asm-generic/bitops/fls64.h> |
| 108 | #include <asm-generic/bitops/find.h> | 108 | #include <asm-generic/bitops/find.h> |
| 109 | #include <asm-generic/bitops/ext2-non-atomic.h> | 109 | #include <asm-generic/bitops/le.h> |
| 110 | 110 | ||
| 111 | #ifdef __XTENSA_EL__ | 111 | #ifdef __XTENSA_EL__ |
| 112 | # define ext2_set_bit_atomic(lock,nr,addr) \ | 112 | # define ext2_set_bit_atomic(lock,nr,addr) \ |
| @@ -125,7 +125,6 @@ static inline unsigned long __fls(unsigned long word) | |||
| 125 | #include <asm-generic/bitops/hweight.h> | 125 | #include <asm-generic/bitops/hweight.h> |
| 126 | #include <asm-generic/bitops/lock.h> | 126 | #include <asm-generic/bitops/lock.h> |
| 127 | #include <asm-generic/bitops/sched.h> | 127 | #include <asm-generic/bitops/sched.h> |
| 128 | #include <asm-generic/bitops/minix.h> | ||
| 129 | 128 | ||
| 130 | #endif /* __KERNEL__ */ | 129 | #endif /* __KERNEL__ */ |
| 131 | 130 | ||