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

Commit 16fddf54 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6' into merge

parents 5492a7e4 cc7feea3

arch/powerpc/mm/hash_utils_64.c

+8 −3
Original line number Diff line number Diff line
@@ -351,9 +351,14 @@ static void __init htab_init_page_sizes(void) 
		mmu_vmalloc_psize = MMU_PAGE_64K;

		if (mmu_linear_psize == MMU_PAGE_4K)

			mmu_linear_psize = MMU_PAGE_64K;

		if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE))

		if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE)) {

			/*

			 * Don't use 64k pages for ioremap on pSeries, since

			 * that would stop us accessing the HEA ethernet.

			 */

			if (!machine_is(pseries))

				mmu_io_psize = MMU_PAGE_64K;

		else

		} else

			mmu_ci_restrictions = 1;

	}

#endif /* CONFIG_PPC_64K_PAGES */

arch/powerpc/sysdev/bestcomm/bestcomm.c

+6 −2
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ bcom_task_alloc(int bd_count, int bd_size, int priv_size) 
	int i, tasknum = -1;

	struct bcom_task *tsk;



	/* Don't try to do anything if bestcomm init failed */

	if (!bcom_eng)

		return NULL;



	/* Get and reserve a task num */

	spin_lock(&bcom_eng->lock);
@@ -484,8 +488,8 @@ mpc52xx_bcom_remove(struct of_device *op) 
}



static struct of_device_id mpc52xx_bcom_of_match[] = {

	{ .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", },

	{ .type = "dma-controller", .compatible = "mpc5200-bestcomm", },

	{ .compatible = "fsl,mpc5200-bestcomm", },

	{ .compatible = "mpc5200-bestcomm", },

	{},

};

arch/powerpc/sysdev/ipic.c

+1 −1
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ static int __init init_ipic_sysfs(void) 
{

	int rc;



	if (!primary_ipic->regs)

	if (!primary_ipic || !primary_ipic->regs)

		return -ENODEV;

	printk(KERN_DEBUG "Registering ipic with sysfs...\n");

arch/sparc64/kernel/ds.c

+1 −2
Original line number Diff line number Diff line
@@ -972,8 +972,7 @@ static void process_ds_work(void) 
	LIST_HEAD(todo);



	spin_lock_irqsave(&ds_lock, flags);

	list_splice(&ds_work_list, &todo);

	INIT_LIST_HEAD(&ds_work_list);

	list_splice_init(&ds_work_list, &todo);

	spin_unlock_irqrestore(&ds_lock, flags);



	list_for_each_entry_safe(qp, tmp, &todo, list) {

arch/sparc64/kernel/head.S

+6 −2
Original line number Diff line number Diff line
@@ -288,8 +288,12 @@ sun4v_chip_type: 
	/* Leave arg2 as-is, prom_mmu_ihandle_cache */

	mov	-1, %l3

	stx	%l3, [%sp + 2047 + 128 + 0x28]	! arg3: mode (-1 default)

	sethi	%hi(8 * 1024 * 1024), %l3

	stx	%l3, [%sp + 2047 + 128 + 0x30]	! arg4: size (8MB)

	/* 4MB align the kernel image size. */

	set	(_end - KERNBASE), %l3

	set	((4 * 1024 * 1024) - 1), %l4

	add	%l3, %l4, %l3

	andn	%l3, %l4, %l3

	stx	%l3, [%sp + 2047 + 128 + 0x30]	! arg4: roundup(ksize, 4MB)

	sethi	%hi(KERNBASE), %l3

	stx	%l3, [%sp + 2047 + 128 + 0x38]	! arg5: vaddr (KERNBASE)

	stx	%g0, [%sp + 2047 + 128 + 0x40]	! arg6: empty