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

Commit 7c8284c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc 

Pull sparc updates from David Miller:

 1) Add finit_module syscall entry.

 2) Remove stray __dev{init,exit} references, from Sam Ravnborg.

Fix up conflicts in the sparc PCI code due to whitespace differences in
the __dev{init,exit} removal (which also came in through Greg).

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: remove __devinit, __devexit annotations
  sparc: Hook up finit_module syscall.
parents b719f430 b7c13f76

arch/sparc/include/uapi/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -407,8 +407,9 @@ 
#define __NR_process_vm_writev	339

#define __NR_kern_features	340

#define __NR_kcmp		341

#define __NR_finit_module	342



#define NR_syscalls		342

#define NR_syscalls		343



/* Bitmask values returned from kern_features system call.  */

#define KERN_FEATURE_MIXED_MODE_STACK	0x00000001

arch/sparc/kernel/pci.c

+8 −4
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ static void apb_calc_first_last(u8 map, u32 *first_p, u32 *last_p) 
/* Cook up fake bus resources for SUNW,simba PCI bridges which lack

 * a proper 'ranges' property.

 */

static void apb_fake_ranges(struct pci_dev *dev, struct pci_bus *bus,

static void apb_fake_ranges(struct pci_dev *dev,

			    struct pci_bus *bus,

			    struct pci_pbm_info *pbm)

{

	struct pci_bus_region region;
@@ -403,13 +404,15 @@ static void apb_fake_ranges(struct pci_dev *dev, struct pci_bus *bus, 
	pcibios_bus_to_resource(dev, res, &region);

}



static void pci_of_scan_bus(struct pci_pbm_info *pbm, struct device_node *node,

static void pci_of_scan_bus(struct pci_pbm_info *pbm,

			    struct device_node *node,

			    struct pci_bus *bus);



#define GET_64BIT(prop, i)	((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])



static void of_scan_pci_bridge(struct pci_pbm_info *pbm,

			       struct device_node *node, struct pci_dev *dev)

			       struct device_node *node,

			       struct pci_dev *dev)

{

	struct pci_bus *bus;

	const u32 *busrange, *ranges;
@@ -500,7 +503,8 @@ static void of_scan_pci_bridge(struct pci_pbm_info *pbm, 
	pci_of_scan_bus(pbm, node, bus);

}



static void pci_of_scan_bus(struct pci_pbm_info *pbm, struct device_node *node,

static void pci_of_scan_bus(struct pci_pbm_info *pbm,

			    struct device_node *node,

			    struct pci_bus *bus)

{

	struct device_node *child;

arch/sparc/kernel/pci_psycho.c

+2 −1
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) 
	pci_config_write8(addr, 64);

}



static void psycho_scan_bus(struct pci_pbm_info *pbm, struct device *parent)

static void psycho_scan_bus(struct pci_pbm_info *pbm,

			    struct device *parent)

{

	pbm_config_busmastering(pbm);

	pbm->is_66mhz_capable = 0;

arch/sparc/kernel/pci_sabre.c

+2 −1
Original line number Diff line number Diff line
@@ -442,7 +442,8 @@ static void sabre_scan_bus(struct pci_pbm_info *pbm, struct device *parent) 
	sabre_register_error_handlers(pbm);

}



static void sabre_pbm_init(struct pci_pbm_info *pbm, struct platform_device *op)

static void sabre_pbm_init(struct pci_pbm_info *pbm,

			   struct platform_device *op)

{

	psycho_pbm_init_common(pbm, op, "SABRE", PBM_CHIP_TYPE_SABRE);

	pbm->pci_afsr = pbm->controller_regs + SABRE_PIOAFSR;

arch/sparc/kernel/pci_schizo.c

+3 −2
Original line number Diff line number Diff line
@@ -1306,8 +1306,9 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm) 
	}

}



static int schizo_pbm_init(struct pci_pbm_info *pbm, struct platform_device *op,

			   u32 portid, int chip_type)

static int schizo_pbm_init(struct pci_pbm_info *pbm,

			   struct platform_device *op, u32 portid,

			   int chip_type)

{

	const struct linux_prom64_registers *regs;

	struct device_node *dp = op->dev.of_node;