Please pull from 'for_paulus' branch

Kumar Gala galak at kernel.crashing.org
Thu May 17 23:00:42 EST 2007


On May 17, 2007, at 5:49 AM, Paul Mackerras wrote:

> Kumar Gala writes:
>
>> diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/htashtable.S
>> index e756942..fc30b6f 100644
>> --- a/arch/ppc/mm/hashtable.S
>> +++ b/arch/ppc/mm/hashtable.S
>
>> @@ -461,9 +465,15 @@ found_slot:
>>  	sync		/* make sure pte updates get to memory */
>>  	blr
>>
>> -	.comm	next_slot,4
>> -	.comm	primary_pteg_full,4
>> -	.comm	htab_hash_searches,4
>> +	.section .bss
>> +	.align	2
>> +next_slot:
>> +	.space	4
>> +primary_pteg_full:
>> +	.space	4
>> +htab_hash_searches:
>> +	.space	4
>> +	.previous
>
> I get this on an ARCH=ppc prep build:
>
> arch/ppc/kernel/built-in.o: In function `__main':
> arch/ppc/kernel/entry.S:(.text+0x2eda): undefined reference to  
> `htab_hash_searches'
> arch/ppc/kernel/entry.S:(.text+0x2ede): undefined reference to  
> `htab_hash_searches'
> arch/ppc/kernel/entry.S:(.text+0x2ee2): undefined reference to  
> `primary_pteg_full'
> arch/ppc/kernel/entry.S:(.text+0x2ee6): undefined reference to
> `primary_pteg_full'
>
> (The references are actually in arch/ppc/kernel/ppc_htab.c.)
>
> I guess I'll cherry-pick the other commits from your tree, since I'm
> making a string for Linus, unless you have a better suggestion.

Sorry for the headache, I thought I had built an ARCH=ppc kernel.   
This is now fixed in my tree so if you haven't pulled it you'll get  
the fix.

Also, added a ppc_ksysm.c fix to remove a duplicate export symbol.

- k



More information about the Linuxppc-dev mailing list