linux-kernel - linux-next: manual merge of the percpu tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110211145810.bdea73a3.sfr@canb.auug.org.au>
Date:	Fri, 11 Feb 2011 14:58:10 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jan Beulich <JBeulich@...ell.com>,
	Shaohua Li <shaohua.li@...el.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: linux-next: manual merge of the percpu tree with the tip tree

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@...b.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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/