Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a626b46e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-bootmem-for-linus' of... 

Merge branch 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
  early_res: Need to save the allocation name in drop_range_partial()
  sparsemem: Fix compilation on PowerPC
  early_res: Add free_early_partial()
  x86: Fix non-bootmem compilation on PowerPC
  core: Move early_res from arch/x86 to kernel/
  x86: Add find_fw_memmap_area
  Move round_up/down to kernel.h
  x86: Make 32bit support NO_BOOTMEM
  early_res: Enhance check_and_double_early_res
  x86: Move back find_e820_area to e820.c
  x86: Add find_early_area_size
  x86: Separate early_res related code from e820.c
  x86: Move bios page reserve early to head32/64.c
  sparsemem: Put mem map for one node together.
  sparsemem: Put usemap for one node together
  x86: Make 64 bit use early_res instead of bootmem before slab
  x86: Only call dma32_reserve_bootmem 64bit !CONFIG_NUMA
  x86: Make early_node_mem get mem > 4 GB if possible
  x86: Dynamically increase early_res array size
  x86: Introduce max_early_res and early_res_count
  ...
parents c1dcb4bb dce46a04

arch/x86/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING 
config ARCH_SUPPORTS_DEBUG_PAGEALLOC

	def_bool y



config HAVE_EARLY_RES

	def_bool y



config HAVE_INTEL_TXT

	def_bool y

	depends on EXPERIMENTAL && DMAR && ACPI
@@ -569,6 +572,18 @@ config PARAVIRT_DEBUG 
	  Enable to debug paravirt_ops internals.  Specifically, BUG if

	  a paravirt_op is missing when it is called.



config NO_BOOTMEM

	default y

	bool "Disable Bootmem code"

	---help---

	  Use early_res directly instead of bootmem before slab is ready.

		- allocator (buddy) [generic]

		- early allocator (bootmem) [generic]

		- very early allocator (reserve_early*()) [x86]

		- very very early allocator (early brk model) [x86]

	  So reduce one layer between early allocator to final allocator





config MEMTEST

	bool "Memtest"

	---help---

arch/x86/include/asm/e820.h

+1 −4
Original line number Diff line number Diff line
@@ -111,11 +111,8 @@ extern unsigned long end_user_pfn; 


extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align);

extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align);

extern void reserve_early(u64 start, u64 end, char *name);

extern void reserve_early_overlap_ok(u64 start, u64 end, char *name);

extern void free_early(u64 start, u64 end);

extern void early_res_to_bootmem(u64 start, u64 end);

extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align);

#include <linux/early_res.h>



extern unsigned long e820_end_of_ram_pfn(void);

extern unsigned long e820_end_of_low_ram_pfn(void);

arch/x86/include/asm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ extern void pci_iommu_alloc(void); 
#include "pci_64.h"

#endif



void dma32_reserve_bootmem(void);



/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>

arch/x86/include/asm/pci_64.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ extern int (*pci_config_read)(int seg, int bus, int dev, int fn, 
extern int (*pci_config_write)(int seg, int bus, int dev, int fn,

			       int reg, int len, u32 value);



extern void dma32_reserve_bootmem(void);



#endif /* __KERNEL__ */



#endif /* _ASM_X86_PCI_64_H */

arch/x86/include/asm/proto.h

+0 −10
Original line number Diff line number Diff line
@@ -23,14 +23,4 @@ extern int reboot_force; 


long do_arch_prctl(struct task_struct *task, int code, unsigned long addr);



/*

 * This looks more complex than it should be. But we need to

 * get the type for the ~ right in round_down (it needs to be

 * as wide as the result!), and we want to evaluate the macro

 * arguments just once each.

 */

#define __round_mask(x,y) ((__typeof__(x))((y)-1))

#define round_up(x,y) ((((x)-1) | __round_mask(x,y))+1)

#define round_down(x,y) ((x) & ~__round_mask(x,y))



#endif /* _ASM_X86_PROTO_H */