rpms/kernel/FC-5 linux-2.6-x86-alternatives-smp-only.patch, NONE, 1.1 kernel-2.6.spec, 1.2136, 1.2137
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 19 00:39:10 UTC 2006
- Previous message (by thread): rpms/kernel/FC-5 linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, 1.1, NONE linux-2.6-audit-new-msg-types.patch, 1.2, NONE linux-2.6-autofs-pathlookup.patch, 1.1, NONE linux-2.6-bcm43xx-assoc-on-startup.patch, 1.1, NONE linux-2.6-bcm43xx-git.patch, 1.3, NONE linux-2.6-bcm43xx-neuter.patch, 1.1, NONE linux-2.6-bcm43xx-set-chan-lockup.patch, 1.1, NONE linux-2.6-bzimage.patch, 1.4, NONE linux-2.6-cell-is-cbea.patch, 1.2, NONE linux-2.6-cell-numa-init.patch, 1.1, NONE linux-2.6-cell-spiderpic-no-devtree.patch, 1.1, NONE linux-2.6-crash-xen.patch, 1.2, NONE linux-2.6-crashdump-common.patch, 1.19, NONE linux-2.6-crashdump-reboot-exports.patch, 1.4, NONE linux-2.6-debug-dual-line-backtrace.patch, 1.3, NONE linux-2.6-debug-pm-pci.patch, 1.1, NONE linux-2.6-debug-reference-discarded-return-result.patch, 1.1, NONE linux-2.6-debug-slab-leaks.patch, 1.2, NONE linux-2.6-defaults-enable-sata-atapi.patch, 1.1, NONE linux-2.6-diskdump.patch, 1.5, NONE linux-2.6-drm-cripple-r300.patch, 1.2, NONE linux-2.6-dump_smp_call_! function.patch, 1.6, NONE linux-2.6-g5-therm-shutdown.patch, 1.1, NONE linux-2.6-header-cleanup-git.patch, 1.1, NONE linux-2.6-header-install-git.patch, 1.1, NONE linux-2.6-hvc-rtas-console.patch, 1.1, NONE linux-2.6-ide-cd-shutup.patch, 1.1, NONE linux-2.6-mptfusion-kdump.patch, 1.1, NONE linux-2.6-net-ipw2200-hwcrypto.patch, 1.1, NONE linux-2.6-net-wireless-features.patch, 1.2, NONE linux-2.6-netconsole.patch, 1.1, NONE linux-2.6-netdump.patch, 1.4, NONE linux-2.6-obsolete-idescsi-warning.patch, 1.1, NONE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, 1.2, NONE linux-2.6-powermac-pfunc-noise.patch, 1.1, NONE linux-2.6-ppc32-check-legacy-io.patch, 1.1, NONE linux-2.6-pwc-powerup-by-default.patch, 1.1, NONE linux-2.6-scsi-advansys-enabler.patch, 1.1, NONE linux-2.6-selinux-disable-attributes-no-policy.patch, 1.1, NONE linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.2, NONE linux-2.6-signal-trampolines-unwind-info.patch, 1.1, NONE linux-2.6-smsc-ircc2-pnp.patch, 1.1, NONE linux-2.6-softmac-assoc-events.patch, 1.1, N! ONE linux-2.6-softmac-default-rate.patch,1.1,NONE linux-2.6-so! ftmac-gi
- Next message (by thread): rpms/autofs/FC-5 autofs-4.1.4-discard-bg-nofg-options.patch, NONE, 1.1 autofs-4.1.4-no-first-message.patch, NONE, 1.1 autofs.spec, 1.80, 1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: davej
Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv27702
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-x86-alternatives-smp-only.patch
Log Message:
Only print info about SMP alternatives on SMP kernels.
linux-2.6-x86-alternatives-smp-only.patch:
arch/i386/kernel/Makefile | 3 ++-
include/asm-i386/bugs.h | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE linux-2.6-x86-alternatives-smp-only.patch ---
On UP kernels, it's silly to print out info about SMP alternatives..
SMP alternatives: switching to UP code
Freeing SMP alternatives: 0k freed
Signed-off-by: Dave Jones <davej at redhat.com>
--- linux-2.6.17.noarch/include/asm-i386/bugs.h~ 2006-06-18 20:32:01.000000000 -0400
+++ linux-2.6.17.noarch/include/asm-i386/bugs.h 2006-06-18 20:32:19.000000000 -0400
@@ -191,5 +191,7 @@ static void __init check_bugs(void)
check_hlt();
check_popad();
system_utsname.machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
- alternative_instructions();
+#ifdef CONFIG_SMP
+ alternative_instructions();
+#endif
}
--- linux-2.6.17.noarch/arch/i386/kernel/Makefile~ 2006-06-18 20:32:26.000000000 -0400
+++ linux-2.6.17.noarch/arch/i386/kernel/Makefile 2006-06-18 20:33:04.000000000 -0400
@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bootflag.o \
- quirks.o i8237.o topology.o alternative.o
+ quirks.o i8237.o topology.o
obj-y += cpu/
obj-y += timers/
@@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
obj-$(CONFIG_VM86) += vm86.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+obj-$(CONFIG_SMP) += alternative.o
EXTRA_AFLAGS := -traditional
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2136
retrieving revision 1.2137
diff -u -r1.2136 -r1.2137
--- kernel-2.6.spec 18 Jun 2006 04:45:01 -0000 1.2136
+++ kernel-2.6.spec 19 Jun 2006 00:39:07 -0000 1.2137
@@ -252,6 +252,7 @@
Patch206: linux-2.6-x86-hp-reboot.patch
Patch207: linux-2.6-x86-cpu_index-false.patch
Patch208: linux-2.6-x86_64-noisy-syscalls.patch
+Patch210: linux-2.6-x86-alternatives-smp-only.patch
# 300 - 399 ppc(64)
Patch302: linux-2.6-offb-find-fb.patch
@@ -757,6 +758,8 @@
%patch207 -p1
# Hush noisy unimplemented 32bit syscalls
%patch208 -p1
+# Only print info about SMP alternatives on SMP kernels.
+%patch210 -p1
#
# ppc64
@@ -1629,6 +1632,7 @@
%changelog
* Sun Jun 18 2006 Dave Jones <davej at redhat.com>
- 2.6.17
+- Only print info about SMP alternatives on SMP kernels.
* Tue Jun 6 2006 Dave Jones <davej at redhat.com> [2.6.16-1.2133_FC5]
- Add a PPC64 kdump kernel.
- Previous message (by thread): rpms/kernel/FC-5 linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, 1.1, NONE linux-2.6-audit-new-msg-types.patch, 1.2, NONE linux-2.6-autofs-pathlookup.patch, 1.1, NONE linux-2.6-bcm43xx-assoc-on-startup.patch, 1.1, NONE linux-2.6-bcm43xx-git.patch, 1.3, NONE linux-2.6-bcm43xx-neuter.patch, 1.1, NONE linux-2.6-bcm43xx-set-chan-lockup.patch, 1.1, NONE linux-2.6-bzimage.patch, 1.4, NONE linux-2.6-cell-is-cbea.patch, 1.2, NONE linux-2.6-cell-numa-init.patch, 1.1, NONE linux-2.6-cell-spiderpic-no-devtree.patch, 1.1, NONE linux-2.6-crash-xen.patch, 1.2, NONE linux-2.6-crashdump-common.patch, 1.19, NONE linux-2.6-crashdump-reboot-exports.patch, 1.4, NONE linux-2.6-debug-dual-line-backtrace.patch, 1.3, NONE linux-2.6-debug-pm-pci.patch, 1.1, NONE linux-2.6-debug-reference-discarded-return-result.patch, 1.1, NONE linux-2.6-debug-slab-leaks.patch, 1.2, NONE linux-2.6-defaults-enable-sata-atapi.patch, 1.1, NONE linux-2.6-diskdump.patch, 1.5, NONE linux-2.6-drm-cripple-r300.patch, 1.2, NONE linux-2.6-dump_smp_call_! function.patch, 1.6, NONE linux-2.6-g5-therm-shutdown.patch, 1.1, NONE linux-2.6-header-cleanup-git.patch, 1.1, NONE linux-2.6-header-install-git.patch, 1.1, NONE linux-2.6-hvc-rtas-console.patch, 1.1, NONE linux-2.6-ide-cd-shutup.patch, 1.1, NONE linux-2.6-mptfusion-kdump.patch, 1.1, NONE linux-2.6-net-ipw2200-hwcrypto.patch, 1.1, NONE linux-2.6-net-wireless-features.patch, 1.2, NONE linux-2.6-netconsole.patch, 1.1, NONE linux-2.6-netdump.patch, 1.4, NONE linux-2.6-obsolete-idescsi-warning.patch, 1.1, NONE linux-2.6-percpu-NR_CPUS-hotplug-fix.patch, 1.2, NONE linux-2.6-powermac-pfunc-noise.patch, 1.1, NONE linux-2.6-ppc32-check-legacy-io.patch, 1.1, NONE linux-2.6-pwc-powerup-by-default.patch, 1.1, NONE linux-2.6-scsi-advansys-enabler.patch, 1.1, NONE linux-2.6-selinux-disable-attributes-no-policy.patch, 1.1, NONE linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.2, NONE linux-2.6-signal-trampolines-unwind-info.patch, 1.1, NONE linux-2.6-smsc-ircc2-pnp.patch, 1.1, NONE linux-2.6-softmac-assoc-events.patch, 1.1, N! ONE linux-2.6-softmac-default-rate.patch,1.1,NONE linux-2.6-so! ftmac-gi
- Next message (by thread): rpms/autofs/FC-5 autofs-4.1.4-discard-bg-nofg-options.patch, NONE, 1.1 autofs-4.1.4-no-first-message.patch, NONE, 1.1 autofs.spec, 1.80, 1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list