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

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

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Silence an annoying boot message
  [POWERPC] Fix early btext debug on PowerMac
  [POWERPC] Demote clockevent printk to KERN_DEBUG
  [POWERPC] Fix CONFIG_SMP=n build error on ppc64
  [POWERPC] Avoid unpaired stwcx. on some processors
  [POWERPC] Fix oops related to 4xx flush_tlb_page modification
  [POWERPC] cpm: Fix a couple minor issues in cpm_common.c.
  [POWERPC] Add -mno-spe for ARCH=powerpc builds
parents 9104476e 6548d83a

arch/powerpc/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ endif 
# No AltiVec instruction when building kernel

KBUILD_CFLAGS += $(call cc-option,-mno-altivec)



# No SPE instruction when building kernel

KBUILD_CFLAGS += $(call cc-option,-mno-spe)



# Enable unit-at-a-time mode when possible. It shrinks the

# kernel considerably.

KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)

arch/powerpc/kernel/btext.c

+3 −1
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ int btext_initialize(struct device_node *np) 
		pitch = *prop;

	if (pitch == 1)

		pitch = 0x1000;

	prop = of_get_property(np, "linux,bootx-addr", NULL);

	if (prop == NULL)

		prop = of_get_property(np, "address", NULL);

	if (prop)

		address = *prop;

arch/powerpc/kernel/entry_32.S

+6 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ syscall_exit_cont: 
	bne-	2f

1:

#endif /* CONFIG_44x */

BEGIN_FTR_SECTION

	lwarx	r7,0,r1

END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)

	stwcx.	r0,0,r1			/* to clear the reservation */

	lwz	r4,_LINK(r1)

	lwz	r5,_CCR(r1)
@@ -717,6 +720,9 @@ restore: 
	mtctr	r11



	PPC405_ERR77(0,r1)

BEGIN_FTR_SECTION

	lwarx	r11,0,r1

END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)

	stwcx.	r0,0,r1			/* to clear the reservation */



#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))

arch/powerpc/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ static void register_decrementer_clockevent(int cpu) 
	*dec = decrementer_clockevent;

	dec->cpumask = cpumask_of_cpu(cpu);



	printk(KERN_INFO "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",

	printk(KERN_DEBUG "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",

	       dec->name, dec->mult, dec->shift, cpu);



	clockevents_register_device(dec);

arch/powerpc/mm/init_64.c

+4 −12
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
 *

 */



#undef DEBUG



#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/kernel.h>
@@ -66,12 +64,6 @@ 


#include "mmu_decl.h"



#ifdef DEBUG

#define DBG(fmt...) printk(fmt)

#else

#define DBG(fmt...)

#endif



#if PGTABLE_RANGE > USER_VSID_RANGE

#warning Limited user VSID range means pagetable space is wasted

#endif
@@ -175,7 +167,7 @@ void pgtable_cache_init(void) 
		int size = pgtable_cache_size[i];

		const char *name = pgtable_cache_name[i];



		DBG("Allocating page table cache %s (#%d) "

		pr_debug("Allocating page table cache %s (#%d) "

			"for size: %08x...\n", name, i, size);

		pgtable_cache[i] = kmem_cache_create(name,

						     size, size,
@@ -239,8 +231,8 @@ int __meminit vmemmap_populate(struct page *start_page, 
		if (!p)

			return -ENOMEM;



		printk(KERN_WARNING "vmemmap %08lx allocated at %p, "

		                    "physical %08lx.\n", start, p, __pa(p));

		pr_debug("vmemmap %08lx allocated at %p, physical %08lx.\n",

			start, p, __pa(p));



		mapped = htab_bolt_mapping(start, start + page_size,

					__pa(p), mode_rw, mmu_linear_psize,