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

Commit 08b5d06e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Introduce pci_map_biosrom()
  x86, olpc: Use device tree for platform identification
parents 13588209 5d94e81f

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2069,7 +2069,7 @@ config OLPC 
	depends on !X86_PAE

	select GPIOLIB

	select OF

	select OF_PROMTREE if PROC_DEVICETREE

	select OF_PROMTREE

	---help---

	  Add support for detecting the unique features of the OLPC

	  XO hardware.

arch/x86/include/asm/olpc_ofw.h

+3 −6
Original line number Diff line number Diff line
@@ -26,15 +26,12 @@ extern void setup_olpc_ofw_pgd(void); 
/* check if OFW was detected during boot */

extern bool olpc_ofw_present(void);



extern void olpc_dt_build_devicetree(void);



#else /* !CONFIG_OLPC */

static inline void olpc_ofw_detect(void) { }

static inline void setup_olpc_ofw_pgd(void) { }

#endif /* !CONFIG_OLPC */



#ifdef CONFIG_OF_PROMTREE

extern void olpc_dt_build_devicetree(void);

#else

static inline void olpc_dt_build_devicetree(void) { }

#endif

#endif /* !CONFIG_OLPC */



#endif /* _ASM_X86_OLPC_OFW_H */

arch/x86/include/asm/probe_roms.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#ifndef _PROBE_ROMS_H_

#define _PROBE_ROMS_H_

struct pci_dev;



extern void __iomem *pci_map_biosrom(struct pci_dev *pdev);

extern void pci_unmap_biosrom(void __iomem *rom);

extern size_t pci_biosrom_size(struct pci_dev *pdev);

#endif

arch/x86/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ void *extend_brk(size_t size, size_t align); 
	type *name;					\

	RESERVE_BRK(name, sizeof(type) * entries)



extern void probe_roms(void);

#ifdef __i386__



void __init i386_start_kernel(void);

extern void probe_roms(void);



#else

void __init x86_64_start_kernel(char *real_mode);

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o 
obj-y			+= time.o ioport.o ldt.o dumpstack.o

obj-y			+= setup.o x86_init.o i8259.o irqinit.o jump_label.o

obj-$(CONFIG_IRQ_WORK)  += irq_work.o

obj-$(CONFIG_X86_32)	+= probe_roms_32.o

obj-y			+= probe_roms.o

obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o

obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o

obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o