diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 18:05:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 18:05:10 -0800 |
| commit | 1ba73b99c34c31ea18b44dcf161c6e1f2838e0fa (patch) | |
| tree | b0ce77589bdf5a860418181cf1704ba75d7fd415 /include | |
| parent | 185d84b4e1f6febebbe30d785fe31310dcf9632a (diff) | |
| parent | cee87af2a5f75713b98d3e65e43872e547122cd5 (diff) | |
| download | op-kernel-dev-1ba73b99c34c31ea18b44dcf161c6e1f2838e0fa.zip op-kernel-dev-1ba73b99c34c31ea18b44dcf161c6e1f2838e0fa.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] kexec: Use EFI_LOADER_DATA for ELF core header
[IA64] permon use-after-free fix
[IA64] sync compat getdents
[IA64] always build arch/ia64/lib/xor.o
[IA64] Remove stack hard limit on ia64
[IA64] point saved_max_pfn to the max_pfn of the entire system
Revert "[IA64] swiotlb abstraction (e.g. for Xen)"
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/meminit.h | 6 | ||||
| -rw-r--r-- | include/asm-ia64/resource.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/swiotlb.h | 9 | ||||
| -rw-r--r-- | include/asm-x86_64/swiotlb.h | 1 |
4 files changed, 5 insertions, 12 deletions
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h index 6dd476b..21ec5f3 100644 --- a/include/asm-ia64/meminit.h +++ b/include/asm-ia64/meminit.h @@ -17,10 +17,11 @@ * - kernel code & data * - crash dumping code reserved region * - Kernel memory map built from EFI memory map + * - ELF core header * * More could be added if necessary */ -#define IA64_MAX_RSVD_REGIONS 7 +#define IA64_MAX_RSVD_REGIONS 8 struct rsvd_region { unsigned long start; /* virtual address of beginning of element */ @@ -36,6 +37,9 @@ extern void find_initrd (void); extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); extern void efi_memmap_init(unsigned long *, unsigned long *); +extern unsigned long vmcore_find_descriptor_size(unsigned long address); +extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end); + /* * For rounding an address to the next IA64_GRANULE_SIZE or order */ diff --git a/include/asm-ia64/resource.h b/include/asm-ia64/resource.h index 77b1eee..ba2272a 100644 --- a/include/asm-ia64/resource.h +++ b/include/asm-ia64/resource.h @@ -2,7 +2,6 @@ #define _ASM_IA64_RESOURCE_H #include <asm/ustack.h> -#define _STK_LIM_MAX DEFAULT_USER_STACK_SIZE #include <asm-generic/resource.h> #endif /* _ASM_IA64_RESOURCE_H */ diff --git a/include/asm-ia64/swiotlb.h b/include/asm-ia64/swiotlb.h deleted file mode 100644 index 452c162..0000000 --- a/include/asm-ia64/swiotlb.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _ASM_SWIOTLB_H -#define _ASM_SWIOTLB_H 1 - -#include <asm/machvec.h> - -#define SWIOTLB_ARCH_NEED_LATE_INIT -#define SWIOTLB_ARCH_NEED_ALLOC - -#endif /* _ASM_SWIOTLB_H */ diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86_64/swiotlb.h index ab913ff..f9c5895 100644 --- a/include/asm-x86_64/swiotlb.h +++ b/include/asm-x86_64/swiotlb.h @@ -44,7 +44,6 @@ extern void swiotlb_init(void); extern int swiotlb_force; #ifdef CONFIG_SWIOTLB -#define SWIOTLB_ARCH_NEED_ALLOC extern int swiotlb; #else #define swiotlb 0 |
