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

Commit dc797470 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] Clean up duplicate includes in drivers/macintosh/
  [POWERPC] Quiet section mismatch warning on pcibios_setup
  [POWERPC] init and exit markings for hvc_iseries
  [POWERPC] Quiet section mismatch in hvc_rtas.c
  [POWERPC] Constify of_platform_driver match_table
  [POWERPC] hvcs: Make some things static and const
  [POWERPC] Constify of_platform_driver name
  [POWERPC] MPIC protected sources
  [POWERPC] of_detach_node()'s device node argument cannot be const
  [POWERPC] Fix ARCH=ppc builds
  [POWERPC] mv64x60: Use mutex instead of semaphore
  [POWERPC] Allow smp_call_function_single() to current cpu
  [POWERPC] Allow exec faults on readable areas on classic 32-bit PowerPC
  [POWERPC] Fix future firmware feature fixups function failure
  [POWERPC] fix showing xmon help
  [POWERPC] Make xmon_write accept a const buffer
  [POWERPC] Fix misspelled "CONFIG_CHECK_CACHE_COHERENCY" Kconfig option.
  [POWERPC] cell: CONFIG_SPE_BASE is a typo
parents 0f760f13 7bd02a20

arch/powerpc/configs/prpmc2800_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ CONFIG_PPC_STD_MMU_32=y 
# CONFIG_PPC_MM_SLICES is not set

# CONFIG_SMP is not set

CONFIG_NOT_COHERENT_CACHE=y

CONFIG_CONFIG_CHECK_CACHE_COHERENCY=y

CONFIG_CHECK_CACHE_COHERENCY=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int pcibios_add_platform_entries(struct pci_dev *pdev) 


}



char __init *pcibios_setup(char *str)

char __devinit *pcibios_setup(char *str)

{

	return str;

}

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -1218,7 +1218,7 @@ void of_attach_node(struct device_node *np) 
 * a reference to the node.  The memory associated with the node

 * is not freed until its refcount goes to zero.

 */

void of_detach_node(const struct device_node *np)

void of_detach_node(struct device_node *np)

{

	struct device_node *parent;

arch/powerpc/kernel/smp.c

+6 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int 
			int wait)

{

	cpumask_t map = CPU_MASK_NONE;

	int ret = -EBUSY;

	int ret = 0;



	if (!cpu_online(cpu))

		return -EINVAL;
@@ -292,6 +292,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int 
	cpu_set(cpu, map);

	if (cpu != get_cpu())

		ret = smp_call_function_map(func,info,nonatomic,wait,map);

	else {

		local_irq_disable();

		func(info);

		local_irq_enable();

	}

	put_cpu();

	return ret;

}

arch/powerpc/mm/fault.c

+7 −1
Original line number Diff line number Diff line
@@ -283,7 +283,13 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, 
		/* protection fault */

		if (error_code & DSISR_PROTFAULT)

			goto bad_area;

		if (!(vma->vm_flags & VM_EXEC))

		/*

		 * Allow execution from readable areas if the MMU does not

		 * provide separate controls over reading and executing.

		 */

		if (!(vma->vm_flags & VM_EXEC) &&

		    (cpu_has_feature(CPU_FTR_NOEXECUTE) ||

		     !(vma->vm_flags & (VM_READ | VM_WRITE))))

			goto bad_area;

#else

		pte_t *ptep;