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/asm-generic/xor.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/asm-generic/xor.h')
| -rw-r--r-- | include/asm-generic/xor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/xor.h b/include/asm-generic/xor.h index aaab875e1a35..6028fb862254 100644 --- a/include/asm-generic/xor.h +++ b/include/asm-generic/xor.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 13 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <asm/processor.h> | 16 | #include <linux/prefetch.h> |
| 17 | 17 | ||
| 18 | static void | 18 | static void |
| 19 | xor_8regs_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) | 19 | xor_8regs_2(unsigned long bytes, unsigned long *p1, unsigned long *p2) |