From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751047Ab1BKD6R (ORCPT ); Thu, 10 Feb 2011 22:58:17 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:33788 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750710Ab1BKD6Q (ORCPT ); Thu, 10 Feb 2011 22:58:16 -0500 Date: Fri, 11 Feb 2011 14:58:10 +1100 From: Stephen Rothwell To: Tejun Heo , Rusty Russell , Christoph Lameter , Ingo Molnar Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Beulich , Shaohua Li , Thomas Gleixner , "H. Peter Anvin" , Peter Zijlstra Subject: linux-next: manual merge of the percpu tree with the tip tree Message-Id: <20110211145810.bdea73a3.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/x86/kernel/vmlinux.lds.S between commit 94d1ac8b55799be10487fff9766cce6d6628462a ("x86: Reduce back the alignment of the per-CPU data section") from the tip tree and commit 19df0c2fef010e94e90df514aaf4e73f6b80145c ("percpu: align percpu readmostly subsection to cacheline") from the percpu tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/x86/kernel/vmlinux.lds.S index e9f7a3c,cef446f..0000000 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@@ -305,7 -305,7 +305,7 @@@ SECTION } #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP) - PERCPU(PAGE_SIZE) - PERCPU(INTERNODE_CACHE_BYTES, THREAD_SIZE) ++ PERCPU(INTERNODE_CACHE_BYTES, PAGE_SIZE) #endif . = ALIGN(PAGE_SIZE);