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

Commit edb16bec 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 several kprobes bugs.
  [SPARC64]: Update defconfig.
  [SPARC64]: dma remove extra brackets
  [SPARC{32,64}]: Propagate ptrace_traceme() return value.
  [SPARC64]: Replace kmalloc+memset with kzalloc
  [SPARC]: Check kzalloc() return value in SUN4D irq/iommu init.
  [SPARC]: Replace kmalloc+memset with kzalloc
  [SPARC64]: Run ctrl-alt-del action for sun4v powerdown request.
  [SPARC64]: Unaligned accesses to userspace are hard errors.
  [SPARC64]: Call do_mathemu on illegal instruction traps too.
  [SPARC64]: Update defconfig.
  [SPARC64]: Add irqtrace/stacktrace/lockdep support.
parents bb7320d1 f0882589

arch/sparc/kernel/ioport.c

+2 −4
Original line number Diff line number Diff line
@@ -317,9 +317,8 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) 
	if ((va = __get_free_pages(GFP_KERNEL|__GFP_COMP, order)) == 0)

		goto err_nopages;



	if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)

	if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL)

		goto err_nomem;

	memset((char*)res, 0, sizeof(struct resource));



	if (allocate_resource(&_sparc_dvma, res, len_total,

	    _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {
@@ -589,12 +588,11 @@ void *pci_alloc_consistent(struct pci_dev *pdev, size_t len, dma_addr_t *pba) 
		return NULL;

	}



	if ((res = kmalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {

	if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {

		free_pages(va, order);

		printk("pci_alloc_consistent: no core\n");

		return NULL;

	}

	memset((char*)res, 0, sizeof(struct resource));



	if (allocate_resource(&_sparc_dvma, res, len_total,

	    _sparc_dvma.start, _sparc_dvma.end, PAGE_SIZE, NULL, NULL) != 0) {

arch/sparc/kernel/of_device.c

+1 −2
Original line number Diff line number Diff line
@@ -793,10 +793,9 @@ struct of_device* of_platform_device_create(struct device_node *np, 
{

	struct of_device *dev;



	dev = kmalloc(sizeof(*dev), GFP_KERNEL);

	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;

	memset(dev, 0, sizeof(*dev));



	dev->dev.parent = parent;

	dev->dev.bus = bus;

arch/sparc/kernel/ptrace.c

+4 −1
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ asmlinkage void do_ptrace(struct pt_regs *regs) 


	if (request == PTRACE_TRACEME) {

		ret = ptrace_traceme();

		if (ret < 0)

			pt_error_return(regs, -ret);

		else

			pt_succ_return(regs, 0);

		goto out;

	}

arch/sparc/kernel/sun4d_irq.c

+5 −2
Original line number Diff line number Diff line
@@ -545,8 +545,11 @@ void __init sun4d_init_sbi_irq(void) 
	nsbi = 0;

	for_each_sbus(sbus)

		nsbi++;

	sbus_actions = (struct sbus_action *)kmalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);

	memset (sbus_actions, 0, (nsbi * 8 * 4 * sizeof(struct sbus_action)));

	sbus_actions = kzalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);

	if (!sbus_actions) {

		prom_printf("SUN4D: Cannot allocate sbus_actions, halting.\n");

		prom_halt();

	}

	for_each_sbus(sbus) {

#ifdef CONFIG_SMP	

		extern unsigned char boot_cpu_id;

arch/sparc/mm/io-unit.c

+6 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/dma.h>

#include <asm/oplib.h>



/* #define IOUNIT_DEBUG */

#ifdef IOUNIT_DEBUG
@@ -41,9 +42,12 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus) 
	struct linux_prom_registers iommu_promregs[PROMREG_MAX];

	struct resource r;



	iounit = kmalloc(sizeof(struct iounit_struct), GFP_ATOMIC);

	iounit = kzalloc(sizeof(struct iounit_struct), GFP_ATOMIC);

	if (!iounit) {

		prom_printf("SUN4D: Cannot alloc iounit, halting.\n");

		prom_halt();

	}



	memset(iounit, 0, sizeof(*iounit));

	iounit->limit[0] = IOUNIT_BMAP1_START;

	iounit->limit[1] = IOUNIT_BMAP2_START;

	iounit->limit[2] = IOUNIT_BMAPM_START;