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

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

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix inline directive in pci_iommu.c
  [SPARC64]: Fix arg passing to compat_sys_ipc().
  [SPARC]: Fix section mismatch warnings in pci.c and pcic.c
  [SUNRPC]: Make sure on-stack cmsg buffer is properly aligned.
  [SPARC]: avoid CHILD_MAX and OPEN_MAX constants
  [SPARC64]: Fix SBUS IOMMU allocation code.
parents 2918cd81 24fc6f00

arch/sparc/kernel/pcic.c

+2 −2
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node) 
/*

 * Normally called from {do_}pci_scan_bus...

 */

void __init pcibios_fixup_bus(struct pci_bus *bus)

void __devinit pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_dev *dev;

	int i, has_io, has_mem;
@@ -842,7 +842,7 @@ static void watchdog_reset() { 
/*

 * Other archs parse arguments here.

 */

char * __init pcibios_setup(char *str)

char * __devinit pcibios_setup(char *str)

{

	return str;

}

arch/sparc/kernel/sys_sunos.c

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ asmlinkage long sunos_sysconf (int name) 
		ret = ARG_MAX;

		break;

	case _SC_CHILD_MAX:

		ret = -1; /* no limit */

		ret = current->signal->rlim[RLIMIT_NPROC].rlim_cur;

		break;

	case _SC_CLK_TCK:

		ret = HZ;
@@ -919,7 +919,7 @@ asmlinkage long sunos_sysconf (int name) 
		ret = NGROUPS_MAX;

		break;

	case _SC_OPEN_MAX:

		ret = OPEN_MAX;

		ret = current->signal->rlim[RLIMIT_NOFILE].rlim_cur;

		break;

	case _SC_JOB_CONTROL:

		ret = 1;	/* yes, we do support job control */

arch/sparc64/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int __init pcibios_init(void) 


subsys_initcall(pcibios_init);



void pcibios_fixup_bus(struct pci_bus *pbus)

void __devinit pcibios_fixup_bus(struct pci_bus *pbus)

{

	struct pci_pbm_info *pbm = pbus->sysdata;
@@ -405,7 +405,7 @@ void pcibios_bus_to_resource(struct pci_dev *pdev, struct resource *res, 
}

EXPORT_SYMBOL(pcibios_bus_to_resource);



char * __init pcibios_setup(char *str)

char * __devinit pcibios_setup(char *str)

{

	return str;

}

arch/sparc64/kernel/pci_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void __iommu_flushall(struct pci_iommu *iommu) 
#define IOPTE_IS_DUMMY(iommu, iopte)	\

	((iopte_val(*iopte) & IOPTE_PAGE) == (iommu)->dummy_page_pa)



static void inline iopte_make_dummy(struct pci_iommu *iommu, iopte_t *iopte)

static inline void iopte_make_dummy(struct pci_iommu *iommu, iopte_t *iopte)

{

	unsigned long val = iopte_val(*iopte);

arch/sparc64/kernel/sbus.c

+232 −328

File changed.

Preview size limit exceeded, changes collapsed.