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

Commit 6bd25e78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents 35e622a6 496b7a51

arch/powerpc/kernel/head_64.S

+1 −3
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ _GLOBAL(__secondary_hold) 
	SET_REG_IMMEDIATE(r4, .hmt_init)

	mtctr	r4

	bctr

#else

#ifdef CONFIG_SMP

#elif defined(CONFIG_SMP) || defined(CONFIG_KEXEC)

	LOAD_REG_IMMEDIATE(r4, .pSeries_secondary_smp_init)

	mtctr	r4

	mr	r3,r24
@@ -166,7 +165,6 @@ _GLOBAL(__secondary_hold) 
#else

	BUG_OPCODE

#endif

#endif



/* This value is used to mark exception frames on the stack. */

	.section ".toc","aw"

arch/powerpc/kernel/lparcfg.c

+4 −2
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int lparcfg_data(struct seq_file *m, void *v) 
	const char *system_id = "";

	unsigned int *lp_index_ptr, lp_index = 0;

	struct device_node *rtas_node;

	int *lrdrp;

	int *lrdrp = NULL;



	rootdn = find_path_device("/");

	if (rootdn) {
@@ -362,7 +362,9 @@ static int lparcfg_data(struct seq_file *m, void *v) 
	seq_printf(m, "partition_id=%d\n", (int)lp_index);



	rtas_node = find_path_device("/rtas");

	lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity", NULL);

	if (rtas_node)

		lrdrp = (int *)get_property(rtas_node, "ibm,lrdr-capacity",

		                            NULL);



	if (lrdrp == NULL) {

		partition_potential_processors = vdso_data->processorCount;

arch/powerpc/kernel/ppc_ksyms.c

+0 −16
Original line number Diff line number Diff line
@@ -79,15 +79,8 @@ EXPORT_SYMBOL(sys_sigreturn); 
EXPORT_SYMBOL(strcpy);

EXPORT_SYMBOL(strncpy);

EXPORT_SYMBOL(strcat);

EXPORT_SYMBOL(strncat);

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(strpbrk);

EXPORT_SYMBOL(strstr);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(strnlen);

EXPORT_SYMBOL(strcmp);

EXPORT_SYMBOL(strncmp);

EXPORT_SYMBOL(strcasecmp);



EXPORT_SYMBOL(csum_partial);
@@ -185,9 +178,6 @@ EXPORT_SYMBOL(adb_try_handler_change); 
EXPORT_SYMBOL(cuda_request);

EXPORT_SYMBOL(cuda_poll);

#endif /* CONFIG_ADB_CUDA */

#ifdef CONFIG_PPC_PMAC

EXPORT_SYMBOL(sys_ctrler);

#endif

#ifdef CONFIG_VT

EXPORT_SYMBOL(kd_mksound);

#endif
@@ -205,7 +195,6 @@ EXPORT_SYMBOL(__lshrdi3); 
EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memscan);

EXPORT_SYMBOL(memcmp);

EXPORT_SYMBOL(memchr);
@@ -214,7 +203,6 @@ EXPORT_SYMBOL(screen_info); 
#endif



#ifdef CONFIG_PPC32

EXPORT_SYMBOL(__delay);

EXPORT_SYMBOL(timer_interrupt);

EXPORT_SYMBOL(irq_desc);

EXPORT_SYMBOL(tb_ticks_per_jiffy);
@@ -222,10 +210,6 @@ EXPORT_SYMBOL(console_drivers); 
EXPORT_SYMBOL(cacheable_memcpy);

#endif



EXPORT_SYMBOL(__up);

EXPORT_SYMBOL(__down);

EXPORT_SYMBOL(__down_interruptible);



#ifdef  CONFIG_8xx

EXPORT_SYMBOL(cpm_install_handler);

EXPORT_SYMBOL(cpm_free_handler);

arch/powerpc/kernel/setup_64.c

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ void smp_release_cpus(void) 


	DBG(" <- smp_release_cpus()\n");

}

#else

#define smp_release_cpus()

#endif /* CONFIG_SMP || CONFIG_KEXEC */



/*
@@ -473,10 +471,12 @@ void __init setup_system(void) 
	check_smt_enabled();

	smp_setup_cpu_maps();



#ifdef CONFIG_SMP

	/* Release secondary cpus out of their spinloops at 0x60 now that

	 * we can map physical -> logical CPU ids

	 */

	smp_release_cpus();

#endif



	printk("Starting Linux PPC64 %s\n", system_utsname.version);

arch/powerpc/kernel/sys_ppc32.c

+0 −4
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ struct timex32 { 
};



extern int do_adjtimex(struct timex *);

extern void ppc_adjtimex(void);



asmlinkage long compat_sys_adjtimex(struct timex32 __user *utp)

{
@@ -209,9 +208,6 @@ asmlinkage long compat_sys_adjtimex(struct timex32 __user *utp) 


	ret = do_adjtimex(&txc);



	/* adjust the conversion of TB to time of day to track adjtimex */

	ppc_adjtimex();



	if(put_user(txc.modes, &utp->modes) ||

	   __put_user(txc.offset, &utp->offset) ||

	   __put_user(txc.freq, &utp->freq) ||