diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:06:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 13:06:39 -0500 |
commit | 9cfc86249f32d984339c6d1f8a1fd1326989b3b8 (patch) | |
tree | 56428d319483f54949de8d9d0a5b3f715287ed91 /arch/um | |
parent | f42647acc4eab1befa9e290691ed7a40f9a7d3cc (diff) | |
parent | 243797f59b748f679ab88d456fcc4f92236d724b (diff) |
Merge branch 'akpm'
* akpm: (173 commits)
genalloc: use bitmap_find_next_zero_area
ia64: use bitmap_find_next_zero_area
sparc: use bitmap_find_next_zero_area
mlx4: use bitmap_find_next_zero_area
isp1362-hcd: use bitmap_find_next_zero_area
iommu-helper: use bitmap library
bitmap: introduce bitmap_set, bitmap_clear, bitmap_find_next_zero_area
qnx4: use hweight8
qnx4fs: remove remains of the (defunct) write support
resource: constify arg to resource_size() and resource_type()
gru: send cross partition interrupts using the gru
gru: function to generate chipset IPI values
gru: update driver version number
gru: improve GRU TLB dropin statistics
gru: fix GRU interrupt race at deallocate
gru: add hugepage support
gru: fix bug in allocation of kernel contexts
gru: update GRU structures to match latest hardware spec
gru: check for correct GRU chiplet assignment
gru: remove stray local_irq_enable
...
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/sys-i386/asm/elf.h | 1 | ||||
-rw-r--r-- | arch/um/sys-ppc/asm/elf.h | 2 | ||||
-rw-r--r-- | arch/um/sys-x86_64/asm/elf.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/arch/um/sys-i386/asm/elf.h b/arch/um/sys-i386/asm/elf.h index d0da9d7c5371..770885472ed4 100644 --- a/arch/um/sys-i386/asm/elf.h +++ b/arch/um/sys-i386/asm/elf.h | |||
@@ -48,7 +48,6 @@ typedef struct user_i387_struct elf_fpregset_t; | |||
48 | PT_REGS_EAX(regs) = 0; \ | 48 | PT_REGS_EAX(regs) = 0; \ |
49 | } while (0) | 49 | } while (0) |
50 | 50 | ||
51 | #define USE_ELF_CORE_DUMP | ||
52 | #define ELF_EXEC_PAGESIZE 4096 | 51 | #define ELF_EXEC_PAGESIZE 4096 |
53 | 52 | ||
54 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) | 53 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) |
diff --git a/arch/um/sys-ppc/asm/elf.h b/arch/um/sys-ppc/asm/elf.h index af9463cd8ce5..8aacaf56508d 100644 --- a/arch/um/sys-ppc/asm/elf.h +++ b/arch/um/sys-ppc/asm/elf.h | |||
@@ -17,8 +17,6 @@ extern long elf_aux_hwcap; | |||
17 | #define ELF_CLASS ELFCLASS32 | 17 | #define ELF_CLASS ELFCLASS32 |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #define USE_ELF_CORE_DUMP | ||
21 | |||
22 | #define R_386_NONE 0 | 20 | #define R_386_NONE 0 |
23 | #define R_386_32 1 | 21 | #define R_386_32 1 |
24 | #define R_386_PC32 2 | 22 | #define R_386_PC32 2 |
diff --git a/arch/um/sys-x86_64/asm/elf.h b/arch/um/sys-x86_64/asm/elf.h index 04b9e87c8dad..49655c83efd2 100644 --- a/arch/um/sys-x86_64/asm/elf.h +++ b/arch/um/sys-x86_64/asm/elf.h | |||
@@ -104,7 +104,6 @@ extern int elf_core_copy_fpregs(struct task_struct *t, elf_fpregset_t *fpu); | |||
104 | clear_thread_flag(TIF_IA32); | 104 | clear_thread_flag(TIF_IA32); |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | #define USE_ELF_CORE_DUMP | ||
108 | #define ELF_EXEC_PAGESIZE 4096 | 107 | #define ELF_EXEC_PAGESIZE 4096 |
109 | 108 | ||
110 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) | 109 | #define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) |