diff --git a/debian/changelog b/debian/changelog index 90b50caf6..0d198465e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ linux-2.6 (2.6.38-2) UNRELEASED; urgency=low * Add configuration for Debian architecture ppc64, matching the powerpc/powerpc64 flavour (Closes: #618976) + [ Jurij Smakov ] + * Bump CONFIG_NR_CPUS on sparc to 256 to accomodate T2+ machines + (Closes: #619435). This is ABI-changing, so bump ABI to 2. + -- Ben Hutchings Sat, 19 Mar 2011 05:17:42 +0000 linux-2.6 (2.6.38-1) unstable; urgency=low diff --git a/debian/config/defines b/debian/config/defines index e532b09b0..c8b4bb597 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: 1 +abiname: 2 [base] arches: diff --git a/debian/config/sparc/config.sparc64-smp b/debian/config/sparc/config.sparc64-smp index d21fda59d..f6412c26e 100644 --- a/debian/config/sparc/config.sparc64-smp +++ b/debian/config/sparc/config.sparc64-smp @@ -2,6 +2,6 @@ ## file: arch/sparc/Kconfig ## CONFIG_SMP=y -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=256 CONFIG_SCHED_SMT=y