r2135 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series
Dann Frazier
dannf@costa.debian.org
Thu, 06 Jan 2005 19:57:05 +0100
Author: dannf
Date: 2005-01-06 19:57:04 +0100 (Thu, 06 Jan 2005)
New Revision: 2135
Modified:
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp.dpatch
trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
Log:
* Imported forward ported versions of patches from Ubuntu's
linux-source-2.6.10 (2.6.10-3) (dann frazier)
. ia64-generic-no-smp-1-to-2.dpatch
. ia64-generic-no-smp.dpatch
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-06 14:24:47 UTC (rev 2134)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog 2005-01-06 18:57:04 UTC (rev 2135)
@@ -69,6 +69,11 @@
. ia64-generic-no-smp-1-to-2.dpatch
. ia64-generic-no-smp.dpatch
+ * Imported forward ported versions of patches from Ubuntu's
+ linux-source-2.6.10 (2.6.10-3) (dann frazier)
+ . ia64-generic-no-smp-1-to-2.dpatch
+ . ia64-generic-no-smp.dpatch
+
* Updated patches to apply against 2.6.10 (Christoph Hellwig):
. powerpc-g4-l2-flush-errata.dpatch
@@ -189,7 +194,7 @@
* Dropped drivers-scsi-generic_proc_info.dpatch, kernel-image packages based
on this release need to depend on initrd-tools >= 0.1.76 (Christoph Hellwig)
- -- Andres Salomon <dilinger@voxel.net> Tue, 04 Jan 2005 23:52:23 -0500
+ -- dann frazier <dannf@debian.org> Thu, 06 Jan 2005 11:56:40 -0700
kernel-source-2.6.9 (2.6.9-4) unstable; urgency=low
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch 2005-01-06 14:24:47 UTC (rev 2134)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp-1-to-2.dpatch 2005-01-06 18:57:04 UTC (rev 2135)
@@ -9,10 +9,10 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/acpi.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/acpi.c
---- kernel-source-2.6.8.defconfig/arch/ia64/kernel/acpi.c 2004-08-13 23:36:58.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/acpi.c 2004-08-15 15:49:38.000000000 -0600
-@@ -618,9 +618,11 @@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/acpi.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/acpi.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/acpi.c 2004-12-24 22:34:45.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/acpi.c 2004-12-27 11:07:57.231729272 +0100
+@@ -627,9 +627,11 @@
if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
}
@@ -25,9 +25,9 @@
/* Make boot-up look pretty */
printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
return 0;
-diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/cyclone.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/cyclone.c
---- kernel-source-2.6.8.defconfig/arch/ia64/kernel/cyclone.c 2004-08-14 13:07:37.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/cyclone.c 2004-08-15 15:49:31.000000000 -0600
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/cyclone.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/cyclone.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/cyclone.c 2004-12-24 22:34:33.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/cyclone.c 2004-12-27 11:07:57.232729120 +0100
@@ -1,8 +1,6 @@
-#include <linux/module.h>
#include <linux/smp.h>
@@ -37,9 +37,9 @@
/* IBM Summit (EXA) Cyclone counter code*/
#define CYCLONE_CBAR_ADDR 0xFEB00CD0
-diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/numa.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/numa.c
---- kernel-source-2.6.8.defconfig/arch/ia64/kernel/numa.c 2004-08-14 13:07:37.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/numa.c 2004-08-15 15:49:38.000000000 -0600
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c 2004-12-27 11:07:50.326778984 +0100
++++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c 2004-12-27 11:07:57.232729120 +0100
@@ -1,46 +1,57 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
@@ -117,25 +117,10 @@
}
-
-#endif /* CONFIG_NUMA */
-diff -urN kernel-source-2.6.8.defconfig/arch/ia64/kernel/setup.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/setup.c
---- kernel-source-2.6.8.defconfig/arch/ia64/kernel/setup.c 2004-08-13 23:36:17.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/arch/ia64/kernel/setup.c 2004-08-15 15:49:38.000000000 -0600
-@@ -317,11 +317,9 @@
- machvec_init(acpi_get_sysname());
- #endif
-
--#ifdef CONFIG_SMP
- /* If we register an early console, allow CPU 0 to printk */
- if (!early_console_setup())
- cpu_set(smp_processor_id(), cpu_online_map);
--#endif
-
- #ifdef CONFIG_ACPI_BOOT
- /* Initialize the ACPI boot-time table parser */
-diff -urN kernel-source-2.6.8.defconfig/arch/ia64/mm/discontig.c kernel-source-2.6.8.newupfix.defconfig/arch/ia64/mm/discontig.c
---- kernel-source-2.6.8.defconfig/arch/ia64/mm/discontig.c 2004-08-14 13:07:37.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/arch/ia64/mm/discontig.c 2004-08-15 15:49:38.000000000 -0600
-@@ -398,8 +398,8 @@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c 2004-12-27 11:07:50.328778680 +0100
++++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c 2004-12-27 11:07:57.233728968 +0100
+@@ -412,8 +412,8 @@
*/
static void __init initialize_pernode_data(void)
{
@@ -145,7 +130,7 @@
for (node = 0; node < numnodes; node++)
pgdat_list[node] = mem_data[node].pgdat;
-@@ -409,12 +409,22 @@
+@@ -423,12 +423,22 @@
memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
sizeof(pgdat_list));
}
@@ -169,7 +154,7 @@
}
/**
-@@ -489,12 +499,11 @@
+@@ -503,12 +513,11 @@
{
int cpu;
@@ -187,18 +172,18 @@
return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
}
-diff -urN kernel-source-2.6.8.defconfig/drivers/serial/sn_console.c kernel-source-2.6.8.newupfix.defconfig/drivers/serial/sn_console.c
---- kernel-source-2.6.8.defconfig/drivers/serial/sn_console.c 2004-08-14 13:07:37.000000000 -0600
-+++ kernel-source-2.6.8.newupfix.defconfig/drivers/serial/sn_console.c 2004-08-15 15:49:31.000000000 -0600
+diff -urNad linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c
+--- linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c 2004-12-24 22:34:33.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.AywF3N/linux-source-2.6.10-2.6.10/drivers/serial/sn_console.c 2004-12-27 11:07:57.234728816 +0100
@@ -50,7 +50,6 @@
#include <linux/miscdevice.h>
#include <linux/serial_core.h>
-#include <asm/io.h>
#include <asm/sn/simulator.h>
- #include <asm/sn/sn2/sn_private.h>
#include <asm/sn/sn_sal.h>
-@@ -1086,9 +1085,7 @@
+
+@@ -1020,9 +1019,7 @@
spin_unlock_irqrestore(&port->sc_port.lock, flags);
puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp.dpatch 2005-01-06 14:24:47 UTC (rev 2134)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/ia64-generic-no-smp.dpatch 2005-01-06 18:57:04 UTC (rev 2135)
@@ -9,20 +9,20 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -Nru a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
---- a/arch/ia64/kernel/Makefile 2004-08-12 18:28:06 -07:00
-+++ b/arch/ia64/kernel/Makefile 2004-08-12 18:28:06 -07:00
-@@ -15,6 +15,7 @@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/Makefile /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/Makefile
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/Makefile 2004-12-28 10:21:08.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/Makefile 2004-12-28 10:21:35.107879896 +0100
+@@ -16,6 +16,7 @@
obj-$(CONFIG_IOSAPIC) += iosapic.o
obj-$(CONFIG_MODULES) += module.o
obj-$(CONFIG_SMP) += smp.o smpboot.o domain.o
+obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o
obj-$(CONFIG_IA64_CYCLONE) += cyclone.o
-
-diff -Nru a/arch/ia64/kernel/numa.c b/arch/ia64/kernel/numa.c
---- /dev/null Wed Dec 31 16:00:00 196900
-+++ b/arch/ia64/kernel/numa.c 2004-08-12 18:28:06 -07:00
+ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c 1970-01-01 01:00:00.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/numa.c 2004-12-28 10:21:35.108879744 +0100
@@ -0,0 +1,46 @@
+#include <linux/config.h>
+#include <linux/topology.h>
@@ -70,10 +70,10 @@
+}
+
+#endif /* CONFIG_NUMA */
-diff -Nru a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
---- a/arch/ia64/kernel/smpboot.c 2004-08-12 18:28:06 -07:00
-+++ b/arch/ia64/kernel/smpboot.c 2004-08-12 18:28:06 -07:00
-@@ -491,47 +491,6 @@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/kernel/smpboot.c /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/smpboot.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/kernel/smpboot.c 2004-12-28 08:46:15.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/kernel/smpboot.c 2004-12-28 10:21:35.108879744 +0100
+@@ -478,47 +478,6 @@
}
}
@@ -121,10 +121,10 @@
/*
* Cycle through the APs sending Wakeup IPIs to boot each.
*/
-diff -Nru a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
---- a/arch/ia64/mm/discontig.c 2004-08-12 18:28:06 -07:00
-+++ b/arch/ia64/mm/discontig.c 2004-08-12 18:28:06 -07:00
-@@ -225,6 +225,33 @@
+diff -urNad linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c
+--- linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c 2004-12-28 08:46:15.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/arch/ia64/mm/discontig.c 2004-12-28 10:21:35.109879592 +0100
+@@ -239,6 +239,33 @@
}
/**
@@ -158,7 +158,7 @@
* find_pernode_space - allocate memory for memory map and per-node structures
* @start: physical start of range
* @len: length of range
-@@ -255,7 +282,7 @@
+@@ -269,7 +296,7 @@
static int __init find_pernode_space(unsigned long start, unsigned long len,
int node)
{
@@ -167,7 +167,7 @@
unsigned long pernodesize = 0, pernode, pages, mapsize;
void *cpu_data;
struct bootmem_data *bdp = &mem_data[node].bootmem_data;
-@@ -305,20 +332,7 @@
+@@ -319,20 +346,7 @@
mem_data[node].pgdat->bdata = bdp;
pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));
@@ -189,7 +189,7 @@
}
return 0;
-@@ -464,6 +478,7 @@
+@@ -478,6 +492,7 @@
find_initrd();
}
@@ -197,7 +197,7 @@
/**
* per_cpu_init - setup per-cpu variables
*
-@@ -483,6 +498,7 @@
+@@ -497,6 +512,7 @@
return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
}
@@ -205,6 +205,20 @@
/**
* show_mem - give short summary of memory stats
+diff -urNad linux-source-2.6.10-2.6.10/include/asm-ia64/smp.h /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/include/asm-ia64/smp.h
+--- linux-source-2.6.10-2.6.10/include/asm-ia64/smp.h 2004-12-28 08:46:15.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/include/asm-ia64/smp.h 2004-12-28 10:21:35.000000000 +0100
+@@ -126,6 +126,7 @@
+ #else
+
+ #define cpu_logical_id(cpuid) 0
++#define cpu_physical_id(i) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
+
+ #endif /* CONFIG_SMP */
+ #endif /* _ASM_IA64_SMP_H */
+diff -urNad linux-source-2.6.10-2.6.10/include/asm-ia64/sn/sn_cpuid.h /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/include/asm-ia64/sn/sn_cpuid.h
+--- linux-source-2.6.10-2.6.10/include/asm-ia64/sn/sn_cpuid.h 2004-12-28 08:46:15.000000000 +0100
++++ /usr/src/dpatchtemp/dpep.WUwgtz/linux-source-2.6.10-2.6.10/include/asm-ia64/sn/sn_cpuid.h 2004-12-28 10:23:01.000000000 +0100
@@ -80,12 +80,6 @@
*
*/
@@ -218,14 +232,3 @@
#define get_node_number(addr) (((unsigned long)(addr)>>38) & 0x7ff)
/*
-diff -Nru a/include/asm-ia64/smp.h b/include/asm-ia64/smp.h
---- a/include/asm-ia64/smp.h 2004-08-12 18:28:06 -07:00
-+++ b/include/asm-ia64/smp.h 2004-08-12 18:28:06 -07:00
-@@ -126,6 +126,7 @@
- #else
-
- #define cpu_logical_id(cpuid) 0
-+#define cpu_physical_id(i) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
-
- #endif /* CONFIG_SMP */
- #endif /* _ASM_IA64_SMP_H */
Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-06 14:24:47 UTC (rev 2134)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-1 2005-01-06 18:57:04 UTC (rev 2135)
@@ -73,3 +73,5 @@
+ 025-track_dummy_capability.dpatch
+ 026-nfs_o_direct_error.dpatch
+ 027-track_dummy_capability-2.dpatch
++ ia64-generic-no-smp.dpatch
++ ia64-generic-no-smp-1-to-2.dpatch