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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents ab396e91 3b212db9

arch/powerpc/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ config PPC_PSERIES 
	select PPC_I8259

	select PPC_RTAS

	select RTAS_ERROR_LOGGING

	select PPC_UDBG_16550

	default y



config PPC_CHRP
@@ -284,6 +285,7 @@ config PPC_CHRP 
	select PPC_INDIRECT_PCI

	select PPC_RTAS

	select PPC_MPC106

	select PPC_UDBG_16550

	default y



config PPC_PMAC
@@ -306,6 +308,7 @@ config PPC_PREP 
	depends on PPC_MULTIPLATFORM && PPC32 && BROKEN

	select PPC_I8259

	select PPC_INDIRECT_PCI

	select PPC_UDBG_16550

	default y



config PPC_MAPLE
@@ -314,6 +317,7 @@ config PPC_MAPLE 
	select U3_DART

	select MPIC_BROKEN_U3

	select GENERIC_TBSYNC

	select PPC_UDBG_16550

	default n

	help

          This option enables support for the Maple 970FX Evaluation Board.
@@ -324,6 +328,7 @@ config PPC_CELL 
	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_RTAS

	select MMIO_NVRAM

	select PPC_UDBG_16550



config PPC_OF

	def_bool y
@@ -370,6 +375,10 @@ config MPIC_BROKEN_U3 
	depends on PPC_MAPLE

	default y



config PPC_UDBG_16550

	bool

	default n



config CELL_IIC

	depends on PPC_CELL

	bool
@@ -403,7 +412,7 @@ config PPC_MPC106 


config GENERIC_TBSYNC

	bool

	default y if CONFIG_PPC32 && CONFIG_SMP

	default y if PPC32 && SMP

	default n



source "drivers/cpufreq/Kconfig"

arch/powerpc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o 
obj-$(CONFIG_6xx)		+= idle_6xx.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_SERIAL_8250)	+= legacy_serial.o udbg_16550.o

obj-$(CONFIG_PPC_UDBG_16550)	+= legacy_serial.o udbg_16550.o

module-$(CONFIG_PPC64)		+= module_64.o

obj-$(CONFIG_MODULES)		+= $(module-y)

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, 
	dev->subsystem_vendor = get_int_prop(node, "subsystem-vendor-id", 0);

	dev->subsystem_device = get_int_prop(node, "subsystem-id", 0);



	dev->cfg_size = 256; /*pci_cfg_space_size(dev);*/

	dev->cfg_size = pci_cfg_space_size(dev);



	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),

		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));

arch/powerpc/kernel/ppc_ksyms.c

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ EXPORT_SYMBOL(set_context); 
extern long mol_trampoline;

EXPORT_SYMBOL(mol_trampoline); /* For MOL */

EXPORT_SYMBOL(flush_hash_pages); /* For MOL */

EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */

#ifdef CONFIG_SMP

extern int mmu_hash_lock;

EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */

arch/powerpc/kernel/rtas_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int of_device_available(struct device_node * dn) 
        return 0;

}



static int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)

int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)

{

	int returnval = -1;

	unsigned long buid, addr;