Please pull from 'for_paulus' branch of powerpc

Kumar Gala galak at kernel.crashing.org
Fri May 5 14:59:35 EST 2006


On May 4, 2006, at 5:49 PM, Paul Mackerras wrote:

> Kumar Gala writes:
>
>> Please pull from 'for_paulus' branch of
>> master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git
>
>> --- a/arch/powerpc/kernel/setup_32.c
>> +++ b/arch/powerpc/kernel/setup_32.c
>> @@ -236,6 +236,7 @@ arch_initcall(ppc_init);
>>  void __init setup_arch(char **cmdline_p)
>>  {
>>  	extern void do_init_bootmem(void);
>> +	extern void setup_panic(void);
>
> Urk.

Yeah didn't care for it either.  Will move to "setup.h"

>
>> @@ -285,6 +286,9 @@ #endif
>>  	/* reboot on panic */
>>  	panic_timeout = 180;
>>
>> +	if (ppc_md.panic)
>> +		setup_panic();
>
> Since no 32-bit platform sets ppc_md.panic AFAICS, I guess this
> doesn't need to be pushed into 2.6.17.  Please redo with setup_panic
> declared in a header file.

Yeah, this was for 2.6.18. (will do on the header change)

- k



More information about the Linuxppc-dev mailing list