diff options
| author | Tejun Heo <tj@kernel.org> | 2012-11-06 15:26:23 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-11-06 15:26:23 -0500 |
| commit | 5b805f2a7675634fbdf9ac1c9b2256905ab2ea68 (patch) | |
| tree | ee00d1e3d757458d66209b926d274491c6c3f61c /arch/tile/kernel/module.c | |
| parent | 1db1e31b1ee3ae126ef98f39083b5f213c7b41bf (diff) | |
| parent | 201e72acb2d3821e2de9ce6091e98859c316b29a (diff) | |
Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8
This is to receive device_cgroup fixes so that further device_cgroup
changes can be made in cgroup/for-3.8.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/tile/kernel/module.c')
| -rw-r--r-- | arch/tile/kernel/module.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index 001cbfa10ac6..243ffebe38d6 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c | |||
| @@ -24,16 +24,6 @@ | |||
| 24 | #include <asm/homecache.h> | 24 | #include <asm/homecache.h> |
| 25 | #include <arch/opcode.h> | 25 | #include <arch/opcode.h> |
| 26 | 26 | ||
| 27 | #ifdef __tilegx__ | ||
| 28 | # define Elf_Rela Elf64_Rela | ||
| 29 | # define ELF_R_SYM ELF64_R_SYM | ||
| 30 | # define ELF_R_TYPE ELF64_R_TYPE | ||
| 31 | #else | ||
| 32 | # define Elf_Rela Elf32_Rela | ||
| 33 | # define ELF_R_SYM ELF32_R_SYM | ||
| 34 | # define ELF_R_TYPE ELF32_R_TYPE | ||
| 35 | #endif | ||
| 36 | |||
| 37 | #ifdef MODULE_DEBUG | 27 | #ifdef MODULE_DEBUG |
| 38 | #define DEBUGP printk | 28 | #define DEBUGP printk |
| 39 | #else | 29 | #else |