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/um/include/asm/common.lds.S | |
| 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/um/include/asm/common.lds.S')
| -rw-r--r-- | arch/um/include/asm/common.lds.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S index ac55b9efa1ce..4938de5512d2 100644 --- a/arch/um/include/asm/common.lds.S +++ b/arch/um/include/asm/common.lds.S | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | INIT_SETUP(0) | 42 | INIT_SETUP(0) |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | PERCPU(32) | 45 | PERCPU_SECTION(32) |
| 46 | 46 | ||
| 47 | .initcall.init : { | 47 | .initcall.init : { |
| 48 | INIT_CALLS | 48 | INIT_CALLS |