From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <galak@kernel.crashing.org>
Received: from nommos.sslcatacombnetworking.com
	(nommos.sslcatacombnetworking.com [67.18.224.114])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTP id D50E7DDE25
	for <linuxppc-dev@ozlabs.org>; Thu, 17 May 2007 23:00:40 +1000 (EST)
In-Reply-To: <17996.13115.456275.413478@cargo.ozlabs.ibm.com>
References: <Pine.LNX.4.64.0705151715200.17092@localhost.localdomain>
	<17996.13115.456275.413478@cargo.ozlabs.ibm.com>
Mime-Version: 1.0 (Apple Message framework v752.2)
Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed
Message-Id: <5F8D37B3-5A2B-49D8-A7C2-615436EA66D3@kernel.crashing.org>
From: Kumar Gala <galak@kernel.crashing.org>
Subject: Re: Please pull from 'for_paulus' branch
Date: Thu, 17 May 2007 08:00:42 -0500
To: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>


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