From 9d9c80e1c0517f73415edf4e7e5b09b1fddf0e2f Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 2 Feb 2009 22:27:02 +0100 Subject: 'bump to latest version, removed buggy acpi patch, removed included patch' --- PATCHCFG | 13 ++----- patches/acpi-buggy-bios.patch | 36 ------------------ patches/pat_fix_reserve_mem_type_for_1mb.patch | 51 -------------------------- 3 files changed, 3 insertions(+), 97 deletions(-) delete mode 100644 patches/acpi-buggy-bios.patch delete mode 100644 patches/pat_fix_reserve_mem_type_for_1mb.patch diff --git a/PATCHCFG b/PATCHCFG index 542c11a..73dfb2d 100644 --- a/PATCHCFG +++ b/PATCHCFG @@ -3,22 +3,20 @@ SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.28.tar.bz2" # Original source directory SRCORIG="linux-2.6.28" # Our source directory -SRCNAME="linux-2.6.28.2-ARCH" +SRCNAME="linux-2.6.28.3-ARCH" # Patches: # URL%patchlevel # or # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( # add upstream patch from 2.6.27 series - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.2.bz2%1 + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.28.3.bz2%1 # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git # fix http://bugs.archlinux.org/task/12821 drm-915.patch%1 - # fix http://bugs.archlinux.org/task/12816 - pat_fix_reserve_mem_type_for_1mb.patch%1 # add custom acpi dsdt patch, in reference to: # http://gaugusch.at/kernel.shtml @@ -29,11 +27,6 @@ PATCHES=( # fix http://bugs.archlinux.org/task/12180 quirks-h12y.patch%1 - # fix buggy bios acpi to get c states, which violate acpi specification, in reference to: - # http://bugzilla.kernel.org/show_bug.cgi?id=7578 - # http://bugs.archlinux.org/task/6875 - acpi-buggy-bios.patch%1 - # add sqashfs support, in reference to: # http://squashfs.sourceforge.net/ # diff extracted from: http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.4.tar.gz @@ -50,7 +43,7 @@ PATCHES=( lhash-2.6.24.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.28.2-1-ARCH" +PATCHNAME="patch-2.6.28.3-1-ARCH" # Run this before applying patches pre_apply() { diff --git a/patches/acpi-buggy-bios.patch b/patches/acpi-buggy-bios.patch deleted file mode 100644 index 3e1ac43..0000000 --- a/patches/acpi-buggy-bios.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- - drivers/acpi/processor_perflib.c | 11 +++++++++++ - 1 files changed, 11 insertions(+) - -http://bugzilla.kernel.org/attachment.cgi?id=9798&action=view - -Index: linux-2.6.19/drivers/acpi/processor_perflib.c -=================================================================== ---- linux-2.6.19.orig/drivers/acpi/processor_perflib.c 2006-12-25 15:40:47.000000000 +0800 -+++ linux-2.6.19/drivers/acpi/processor_perflib.c 2006-12-26 09:20:14.000000000 +0800 -@@ -258,6 +258,7 @@ static int acpi_processor_get_performanc - for (i = 0; i < pr->performance->state_count; i++) { - - struct acpi_processor_px *px = &(pr->performance->states[i]); -+ int j; - - state.length = sizeof(struct acpi_processor_px); - state.pointer = px; -@@ -273,6 +274,16 @@ static int acpi_processor_get_performanc - goto end; - } - -+ /* -+ * Fixme: Duplicated core frequency is allowed, if they have the same control and status -+ */ -+ if (px->core_frequency == 1992) -+ for (j = 0; j < i; j++) { -+ if (pr->performance->states[j].control == px->control && pr->performance->states[j].core_frequency > 1992) -+ ACPI_DEBUG_PRINT((ACPI_DB_WARN, "States [%d] :Wrong processor core frequency %u, set it to 1992\n", j, (u32)pr->performance->states[j].core_frequency)); -+ pr->performance->states[j].core_frequency = 1992; -+ } -+ - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "State [%d]: core_frequency[%d] power[%d] transition_latency[%d] bus_master_latency[%d] control[0x%x] status[0x%x]\n", - i, - diff --git a/patches/pat_fix_reserve_mem_type_for_1mb.patch b/patches/pat_fix_reserve_mem_type_for_1mb.patch deleted file mode 100644 index 120f99e..0000000 --- a/patches/pat_fix_reserve_mem_type_for_1mb.patch +++ /dev/null @@ -1,51 +0,0 @@ -[patch] x86, pat: fix reserve_memtype() for legacy 1MB range - -Thierry Vignaud reported: -> On P4 with an SiS motherboard (video card is a SiS 651) -> X server fails to start with error: -> xf86MapVidMem: Could not mmap framebuffer (0x00000000,0x2000) (Invalid -> argument) - -Here X is trying to map first 8KB of memory using /dev/mem. Existing -code treats first 0-4KB of memory as non-RAM and 4KB-8KB as RAM. Recent -code changes don't allow to map memory with different attributes -at the same time. - -Fix this by treating the first 1MB legacy region as special and always -track the attribute requests with in this region using linear linked -list (and don't bother if the range is RAM or non-RAM or mixed) - -Signed-off-by: Suresh Siddha -Signed-off-by: Venkatesh Pallipadi ---- - -diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c -index 85cbd3c..c959a4d 100644 ---- a/arch/x86/mm/pat.c -+++ b/arch/x86/mm/pat.c -@@ -333,11 +333,20 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, - req_type & _PAGE_CACHE_MASK); - } - -- is_range_ram = pagerange_is_ram(start, end); -- if (is_range_ram == 1) -- return reserve_ram_pages_type(start, end, req_type, new_type); -- else if (is_range_ram < 0) -- return -EINVAL; -+ /* -+ * For legacy reasons, some parts of the physical address range in the -+ * legacy 1MB region is treated as non-RAM (even when listed as RAM in -+ * the e820 tables). So we will track the memory attributes of this -+ * legacy 1MB region using the linear memtype_list always. -+ */ -+ if (end >= ISA_END_ADDRESS) { -+ is_range_ram = pagerange_is_ram(start, end); -+ if (is_range_ram == 1) -+ return reserve_ram_pages_type(start, end, req_type, -+ new_type); -+ else if (is_range_ram < 0) -+ return -EINVAL; -+ } - - new = kmalloc(sizeof(struct memtype), GFP_KERNEL); - if (!new) -- cgit v1.2.3