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

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

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: Hook up sys_preadv and sys_pwritev
  sparc64: add_node_ranges() must be __init
  serial: sunsu: sunsu_kbd_ms_init needs to be __devinit
  sparc: Fix section mismatch warnings in cs4231 sound driver.
  sparc64: Fix section mismatch warnings in PCI controller drivers.
  sparc64: Fix section mismatch warnings in power driver.
  sparc64: get_cells() can't be marked __init
parents a7b334de 018ef969

arch/sparc/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -392,8 +392,10 @@ 
#define __NR_pipe2		321

#define __NR_inotify_init1	322

#define __NR_accept4		323

#define __NR_preadv		324

#define __NR_pwritev		325



#define NR_SYSCALLS		324

#define NR_SYSCALLS		326



#ifdef __32bit_syscall_numbers__

/* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,

arch/sparc/kernel/of_device_64.c

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ static inline u64 of_read_addr(const u32 *cell, int size) 
	return r;

}



static void __init get_cells(struct device_node *dp,

			     int *addrc, int *sizec)

static void get_cells(struct device_node *dp, int *addrc, int *sizec)

{

	if (addrc)

		*addrc = of_n_addr_cells(dp);

arch/sparc/kernel/pci_fire.c

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void pci_fire_hw_init(struct pci_pbm_info *pbm) 
	upa_writeq(~(u64)0, pbm->pbm_regs + FIRE_PEC_IENAB);

}



static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm,

static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,

				       struct of_device *op, u32 portid)

{

	const struct linux_prom64_registers *regs;

arch/sparc/kernel/pci_psycho.c

+4 −4
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void pbm_config_busmastering(struct pci_pbm_info *pbm) 
	pci_config_write8(addr, 64);

}



static void __init psycho_scan_bus(struct pci_pbm_info *pbm,

static void __devinit psycho_scan_bus(struct pci_pbm_info *pbm,

				      struct device *parent)

{

	pbm_config_busmastering(pbm);
@@ -482,7 +482,7 @@ static void psycho_pbm_strbuf_init(struct pci_pbm_info *pbm, 
#define PSYCHO_MEMSPACE_B	0x180000000UL

#define PSYCHO_MEMSPACE_SIZE	0x07fffffffUL



static void __init psycho_pbm_init(struct pci_pbm_info *pbm,

static void __devinit psycho_pbm_init(struct pci_pbm_info *pbm,

				      struct of_device *op, int is_pbm_a)

{

	psycho_pbm_init_common(pbm, op, "PSYCHO", PBM_CHIP_TYPE_PSYCHO);

arch/sparc/kernel/pci_sabre.c

+4 −4
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static void apb_init(struct pci_bus *sabre_bus) 
	}

}



static void __init sabre_scan_bus(struct pci_pbm_info *pbm,

static void __devinit sabre_scan_bus(struct pci_pbm_info *pbm,

				     struct device *parent)

{

	static int once;
@@ -442,7 +442,7 @@ static void __init sabre_scan_bus(struct pci_pbm_info *pbm, 
	sabre_register_error_handlers(pbm);

}



static void __init sabre_pbm_init(struct pci_pbm_info *pbm,

static void __devinit sabre_pbm_init(struct pci_pbm_info *pbm,

				     struct of_device *op)

{

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