r2675 - trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches
Sven Luther
luther@costa.debian.org
Fri, 11 Mar 2005 16:32:13 +0100
Author: luther
Date: 2005-03-11 16:32:13 +0100 (Fri, 11 Mar 2005)
New Revision: 2675
Removed:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ipv4-fragment-queues-2.dpatch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/outs.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
Log:
Cleaned up the not-applied patches, and TODO list for 2.6.11-1.
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-11 14:48:58 UTC (rev 2674)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO 2005-03-11 15:32:13 UTC (rev 2675)
@@ -1,9 +1,3 @@
-# + remove-references-to-removed-drivers.dpatch # FAILED
-# tg3: sed script to just kill the tg3 firmware
-# + keep the patch to add firmware loading separate
+1) clear the non-free firmware pruning issue.
-# + ipv4-fragment-queues-2.dpatch # DROP, code seems to have dissapeared upstream ?
-# + outs.dpatch # DROP, dropped on trippeh's recomendation.
-
-# + ia64-generic-no-smp.dpatch # DROP, a new patch is needed.
-# + ia64-generic-no-smp-1-to-2.dpatch # DROP, a new patch is needed.
+2) redo the ia64 generic-no-smp patches, if still needed.
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp-1-to-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp-1-to-2.dpatch 2005-03-11 14:48:58 UTC (rev 2674)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp-1-to-2.dpatch 2005-03-11 15:32:13 UTC (rev 2675)
@@ -1,174 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fix CONFIG_IA64_GENERIC compilation for UP (rev 2)
-## DP: Patch author: Jesse Barnes <jbarnes@sgi.com>
-## DP: Upstream status: submitted
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-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];
- }
-- build_cpu_to_node_map();
- # endif
- #endif
-+#ifdef CONFIG_ACPI_NUMA
-+ build_cpu_to_node_map();
-+#endif
- /* Make boot-up look pretty */
- printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
- return 0;
-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>
- #include <linux/time.h>
- #include <linux/errno.h>
--#include <asm/io.h>
-
- /* IBM Summit (EXA) Cyclone counter code*/
- #define CYCLONE_CBAR_ADDR 0xFEB00CD0
-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
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ * ia64 kernel NUMA specific stuff
-+ *
-+ * Copyright (C) 2002 Erich Focht <efocht@ess.nec.de>
-+ * Copyright (C) 2004 Silicon Graphics, Inc.
-+ * Jesse Barnes <jbarnes@sgi.com>
-+ */
- #include <linux/config.h>
- #include <linux/topology.h>
- #include <linux/module.h>
- #include <asm/processor.h>
- #include <asm/smp.h>
-
--#ifdef CONFIG_NUMA
--
--/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
- u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
- EXPORT_SYMBOL(cpu_to_node_map);
--/* which logical CPUs are on which nodes */
-+
- cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
-
--/*
-- * Build cpu to node mapping and initialize the per node cpu masks.
-+/**
-+ * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
-+ *
-+ * Build cpu to node mapping and initialize the per node cpu masks using
-+ * info from the node_cpuid array handed to us by ACPI.
- */
--void __init
--build_cpu_to_node_map (void)
-+void __init build_cpu_to_node_map(void)
- {
- int cpu, i, node;
-
-- for(node=0; node<MAX_NUMNODES; node++)
-+ for(node=0; node < MAX_NUMNODES; node++)
- cpus_clear(node_to_cpu_mask[node]);
-+
- for(cpu = 0; cpu < NR_CPUS; ++cpu) {
-- /*
-- * All Itanium NUMA platforms I know use ACPI, so maybe we
-- * can drop this ifdef completely. [EF]
-- */
--#ifdef CONFIG_ACPI_NUMA
- node = -1;
- for (i = 0; i < NR_CPUS; ++i)
- if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
- node = node_cpuid[i].nid;
- break;
- }
--#else
--# error Fixme: Dunno how to build CPU-to-node map.
--#endif
- cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
- if (node >= 0)
- cpu_set(cpu, node_to_cpu_mask[node]);
- }
- }
--
--#endif /* CONFIG_NUMA */
-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)
- {
-- int cpu, node;
- pg_data_t *pgdat_list[NR_NODES];
-+ int cpu, node;
-
- for (node = 0; node < numnodes; node++)
- pgdat_list[node] = mem_data[node].pgdat;
-@@ -423,12 +423,22 @@
- memcpy(mem_data[node].node_data->pg_data_ptrs, pgdat_list,
- sizeof(pgdat_list));
- }
--
-+#ifdef CONFIG_SMP
- /* Set the node_data pointer for each per-cpu struct */
- for (cpu = 0; cpu < NR_CPUS; cpu++) {
- node = node_cpuid[cpu].nid;
- per_cpu(cpu_info, cpu).node_data = mem_data[node].node_data;
- }
-+#else
-+ {
-+ struct cpuinfo_ia64 *cpu0_cpu_info;
-+ cpu = 0;
-+ node = node_cpuid[cpu].nid;
-+ cpu0_cpu_info = (struct cpuinfo_ia64 *)(__phys_per_cpu_start +
-+ ((char *)&per_cpu__cpu_info - __per_cpu_start));
-+ cpu0_cpu_info->node_data = mem_data[node].node_data;
-+ }
-+#endif /* CONFIG_SMP */
- }
-
- /**
-@@ -503,12 +513,11 @@
- {
- int cpu;
-
-- if (smp_processor_id() == 0) {
-- for (cpu = 0; cpu < NR_CPUS; cpu++) {
-- per_cpu(local_per_cpu_offset, cpu) =
-- __per_cpu_offset[cpu];
-- }
-- }
-+ if (smp_processor_id() != 0)
-+ return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
-+
-+ for (cpu = 0; cpu < NR_CPUS; cpu++)
-+ per_cpu(local_per_cpu_offset, cpu) = __per_cpu_offset[cpu];
-
- return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
- }
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp.dpatch 2005-03-11 14:48:58 UTC (rev 2674)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ia64-generic-no-smp.dpatch 2005-03-11 15:32:13 UTC (rev 2675)
@@ -1,234 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fix CONFIG_IA64_GENERIC compilation for UP
-## DP: Patch author: Jesse Barnes <jbarnes@sgi.com>
-## DP: Upstream status: submitted
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-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
- 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>
-+#include <linux/module.h>
-+#include <asm/processor.h>
-+#include <asm/smp.h>
-+
-+#ifdef CONFIG_NUMA
-+
-+/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
-+u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
-+EXPORT_SYMBOL(cpu_to_node_map);
-+/* which logical CPUs are on which nodes */
-+cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
-+
-+/*
-+ * Build cpu to node mapping and initialize the per node cpu masks.
-+ */
-+void __init
-+build_cpu_to_node_map (void)
-+{
-+ int cpu, i, node;
-+
-+ for(node=0; node<MAX_NUMNODES; node++)
-+ cpus_clear(node_to_cpu_mask[node]);
-+ for(cpu = 0; cpu < NR_CPUS; ++cpu) {
-+ /*
-+ * All Itanium NUMA platforms I know use ACPI, so maybe we
-+ * can drop this ifdef completely. [EF]
-+ */
-+#ifdef CONFIG_ACPI_NUMA
-+ node = -1;
-+ for (i = 0; i < NR_CPUS; ++i)
-+ if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
-+ node = node_cpuid[i].nid;
-+ break;
-+ }
-+#else
-+# error Fixme: Dunno how to build CPU-to-node map.
-+#endif
-+ cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
-+ if (node >= 0)
-+ cpu_set(cpu, node_to_cpu_mask[node]);
-+ }
-+}
-+
-+#endif /* CONFIG_NUMA */
-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 @@
- }
- }
-
--#ifdef CONFIG_NUMA
--
--/* on which node is each logical CPU (one cacheline even for 64 CPUs) */
--u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
--EXPORT_SYMBOL(cpu_to_node_map);
--/* which logical CPUs are on which nodes */
--cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
--
--/*
-- * Build cpu to node mapping and initialize the per node cpu masks.
-- */
--void __init
--build_cpu_to_node_map (void)
--{
-- int cpu, i, node;
--
-- for(node=0; node<MAX_NUMNODES; node++)
-- cpus_clear(node_to_cpu_mask[node]);
-- for(cpu = 0; cpu < NR_CPUS; ++cpu) {
-- /*
-- * All Itanium NUMA platforms I know use ACPI, so maybe we
-- * can drop this ifdef completely. [EF]
-- */
--#ifdef CONFIG_ACPI_NUMA
-- node = -1;
-- for (i = 0; i < NR_CPUS; ++i)
-- if (cpu_physical_id(cpu) == node_cpuid[i].phys_id) {
-- node = node_cpuid[i].nid;
-- break;
-- }
--#else
--# error Fixme: Dunno how to build CPU-to-node map.
--#endif
-- cpu_to_node_map[cpu] = (node >= 0) ? node : 0;
-- if (node >= 0)
-- cpu_set(cpu, node_to_cpu_mask[node]);
-- }
--}
--
--#endif /* CONFIG_NUMA */
--
- /*
- * Cycle through the APs sending Wakeup IPIs to boot each.
- */
-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 @@
- }
-
- /**
-+ * per_cpu_node_setup - setup per-cpu areas on each node
-+ * @cpu_data: per-cpu area on this node
-+ * @node: node to setup
-+ *
-+ * Copy the static per-cpu data into the region we just set aside and then
-+ * setup __per_cpu_offset for each CPU on this node. Return a pointer to
-+ * the end of the area.
-+ */
-+static void *per_cpu_node_setup(void *cpu_data, int node)
-+{
-+#ifdef CONFIG_SMP
-+ int cpu;
-+
-+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+ if (node == node_cpuid[cpu].nid) {
-+ memcpy(__va(cpu_data), __phys_per_cpu_start,
-+ __per_cpu_end - __per_cpu_start);
-+ __per_cpu_offset[cpu] = (char*)__va(cpu_data) -
-+ __per_cpu_start;
-+ cpu_data += PERCPU_PAGE_SIZE;
-+ }
-+ }
-+#endif
-+ return cpu_data;
-+}
-+
-+/**
- * find_pernode_space - allocate memory for memory map and per-node structures
- * @start: physical start of range
- * @len: length of range
-@@ -269,7 +296,7 @@
- static int __init find_pernode_space(unsigned long start, unsigned long len,
- int node)
- {
-- unsigned long epfn, cpu, cpus;
-+ unsigned long epfn, cpus;
- unsigned long pernodesize = 0, pernode, pages, mapsize;
- void *cpu_data;
- struct bootmem_data *bdp = &mem_data[node].bootmem_data;
-@@ -319,20 +346,7 @@
- mem_data[node].pgdat->bdata = bdp;
- pernode += L1_CACHE_ALIGN(sizeof(pg_data_t));
-
-- /*
-- * Copy the static per-cpu data into the region we
-- * just set aside and then setup __per_cpu_offset
-- * for each CPU on this node.
-- */
-- for (cpu = 0; cpu < NR_CPUS; cpu++) {
-- if (node == node_cpuid[cpu].nid) {
-- memcpy(__va(cpu_data), __phys_per_cpu_start,
-- __per_cpu_end - __per_cpu_start);
-- __per_cpu_offset[cpu] = (char*)__va(cpu_data) -
-- __per_cpu_start;
-- cpu_data += PERCPU_PAGE_SIZE;
-- }
-- }
-+ cpu_data = per_cpu_node_setup(cpu_data, node);
- }
-
- return 0;
-@@ -478,6 +492,7 @@
- find_initrd();
- }
-
-+#ifdef CONFIG_SMP
- /**
- * per_cpu_init - setup per-cpu variables
- *
-@@ -497,6 +512,7 @@
-
- return __per_cpu_start + __per_cpu_offset[smp_processor_id()];
- }
-+#endif /* CONFIG_SMP */
-
- /**
- * 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 @@
- *
- */
-
--#ifndef CONFIG_SMP
--#define cpu_logical_id(cpu) 0
--#define cpu_physical_id(cpuid) ((ia64_getreg(_IA64_REG_CR_LID) >> 16) & 0xffff)
--#endif
--
--
- #define get_node_number(addr) (((unsigned long)(addr)>>38) & 0x7ff)
-
- /*
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ipv4-fragment-queues-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ipv4-fragment-queues-2.dpatch 2005-03-11 14:48:58 UTC (rev 2674)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/ipv4-fragment-queues-2.dpatch 2005-03-11 15:32:13 UTC (rev 2675)
@@ -1,16 +0,0 @@
-# origin: Horms <horms@debian.org>
-# description: fix for ipfras queue's for ip_fw_compat.c
-# inclusion: This code does not seem to be upstream any more
-# revision date: 2005-02-23
---- a/net/ipv4/netfilter/ip_fw_compat.c.unedited 2005-02-23 11:56:51.000000000 +0900
-+++ b/net/ipv4/netfilter/ip_fw_compat.c 2005-02-23 11:56:53.000000000 +0900
-@@ -80,7 +80,8 @@ fw_in(unsigned int hooknum,
- &redirpt, pskb);
-
- if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
-- *pskb = ip_ct_gather_frags(*pskb);
-+ *pskb = ip_ct_gather_frags(*pskb,
-+ IP_DEFRAG_CONNTRACK_IN);
-
- if (!*pskb)
- return NF_STOLEN;
Deleted: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/outs.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/outs.dpatch 2005-03-11 14:48:58 UTC (rev 2674)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/outs.dpatch 2005-03-11 15:32:13 UTC (rev 2675)
@@ -1,24 +0,0 @@
-#! /bin/sh -e
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [CAN-2005-0204]: AMD64, allows local users to write to privileged IO ports via OUTS instruction
-## DP: Patch author: Suresh Siddha (suresh.b.siddha@intel.com)
-## DP: Upstream status: unknown
-## DP: URL: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=146244
-## DP: Patch source: Micah Anderson <micah@riseup.net> (debian-kernel)
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- linux-2.6.9/include/asm-x86_64/desc.h 2005-01-30 20:08:12.799247944 -0800
-+++ linux-2.6.9/include/asm-x86_64/desc.h 2005-01-30 20:08:12.799247944 -0800
-@@ -128,7 +128,7 @@
- {
- set_tssldt_descriptor(&cpu_gdt_table[cpu][GDT_ENTRY_TSS], (unsigned long)addr,
- DESC_TSS,
-- sizeof(struct tss_struct) - 1);
-+ IO_BITMAP_OFFSET + IO_BITMAP_BYTES + 7);
- }
-
- static inline void set_ldt_desc(unsigned cpu, void *addr, int size)