Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at Wed Sep 28 15:02:25 CEST 2011.
--------
--- kernel-source/kernel-debug.changes 2011-09-15 15:08:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2011-09-28 14:23:56.000000000 +0200
@@ -1,0 +2,70 @@
+Tue Sep 27 22:25:34 CEST 2011 - eich@suse.de
+
+- Refresh patches.suse/SUSE-bootsplash.
+ Fix crash when updating boxes: Don't reallocate
+ picture.
+- commit ba0cfdc
+
+-------------------------------------------------------------------
+Mon Sep 26 15:56:27 CEST 2011 - mmarek@suse.cz
+
+- rpm/host-memcpy-hack.h: Hack to use older version of the memcpy symbol
+ in userspace programs, so that they keep working on older systems.
+- rpm/kernel-binary.spec.in: Pass -include
+ %_sourcedir/host-memcpy-hack.h to the compiler when compiling
+ userspace programs.
+- commit 1de2384
+
+-------------------------------------------------------------------
+Mon Sep 26 13:23:42 CEST 2011 - jbeulich@novell.com
+
+- Update Xen patches to 3.1-rc7 and c/s 1105.
+- pass PCI segment information to Xen.
+- ACPI: Implement overriding of arbitrary ACPI tables via initrd.
+- x86: allow NVS can be accessed by driver.
+- commit 7de39e8
+
+-------------------------------------------------------------------
+Mon Sep 26 10:01:25 CEST 2011 - jeffm@suse.com
+
+- Update to 3.1-rc7.
+- commit ee8cc90
+
+-------------------------------------------------------------------
+Wed Sep 21 13:20:35 CEST 2011 - trenn@suse.de
+
+- Refresh
+ patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch.
+-> Fix build on ia64, by moving asm/e820.h into ifdef config protected region.
+- commit 0ac4276
+
+-------------------------------------------------------------------
+Wed Sep 21 11:16:18 CEST 2011 - mhocko@suse.cz
+
+- Provide memory controller swap extension.
+ Keep the feature disabled by default. Use swapaccount=1 kernel
+ boot parameter for enabling it.
+- commit 000742c
+
+-------------------------------------------------------------------
+Wed Sep 21 11:11:10 CEST 2011 - mhocko@suse.cz
+
+- Update config files.
+ Clean run_oldconfig.sh run to get configs into sync
+- commit c985824
+
+-------------------------------------------------------------------
+Tue Sep 20 18:09:04 CEST 2011 - trenn@suse.de
+
+- ACPI: Implement overriding of arbitrary ACPI tables via initrd
+ (none).
+- ACPICA: Fix wrongly mapped acpi table header when overriding
+ via initrd (none).
+- ACPICA: Introduce acpi_os_phys_table_override function (none).
+- x86: allow NVS can be accessed by driver (none).
+- Update config files:
+ CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+ on i386 and x86_64 flavors
+- commit 34bb195
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-desktop.changes: same change
kernel-docs.changes: same change
kernel-ec2.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-trace.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
calling whatdependson for head-i586
Old:
----
linux-3.1-rc6.tar.bz2
New:
----
host-memcpy-hack.h
linux-3.1-rc7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200
+++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200
@@ -17,8 +17,8 @@
# norootforbuild
-%define srcversion 3.1-rc6
-%define patchversion 3.1.0-rc6
+%define srcversion 3.1-rc7
+%define patchversion 3.1.0-rc7
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -55,8 +55,8 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
-Version: 3.1.rc6
-Release: 1
+Version: 3.1.rc7
+Release: <RELEASE>
%if %using_buildservice
%else
%endif
@@ -176,6 +176,7 @@
Source65: kernel-spec-macros
Source66: configtool.pl
Source67: log.sh
+Source68: host-memcpy-hack.h
Source100: config.tar.bz2
Source101: config.addon.tar.bz2
Source102: patches.arch.tar.bz2
@@ -293,6 +294,21 @@
cd %kernel_build_dir
+# Override the timestamp 'uname -v' reports with the source timestamp and
+# the commit hash.
+date=$(head -n 1 %_sourcedir/source-timestamp)
+commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
+cat > .kernel-binary.spec.buildenv < localversion
fi
@@ -338,19 +354,6 @@
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
-# Override the timestamp 'uname -v' reports with the source timestamp and
-# the commit hash.
-date=$(head -n 1 %_sourcedir/source-timestamp)
-commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
-cat > .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < localversion
fi
@@ -336,19 +352,6 @@
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
-# Override the timestamp 'uname -v' reports with the source timestamp and
-# the commit hash.
-date=$(head -n 1 %_sourcedir/source-timestamp)
-commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
-cat > .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < localversion
fi
@@ -345,19 +361,6 @@
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
-# Override the timestamp 'uname -v' reports with the source timestamp and
-# the commit hash.
-date=$(head -n 1 %_sourcedir/source-timestamp)
-commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
-cat > .kernel-binary.spec.buildenv < .kernel-binary.spec.buildenv < localversion
fi
@@ -262,19 +277,6 @@
rm -f source
find . ! -type d -printf '%%P\n' > %my_builddir/obj-files
-# Override the timestamp 'uname -v' reports with the source timestamp and
-# the commit hash.
-date=$(head -n 1 %_sourcedir/source-timestamp)
-commit=$(sed -n 's/GIT Revision: //p' %_sourcedir/source-timestamp)
-cat > .kernel-binary.spec.buildenv < linux-3.1-rc7.tar.bz2 ++++++
kernel-source/linux-3.1-rc6.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-3.1-rc7.tar.bz2 differ: char 11, line 1
++++++ minmem ++++++
--- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200
+++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200
@@ -1 +1 @@
-2096000
+1048576
++++++ needed_space_in_mb ++++++
--- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:36.000000000 +0200
+++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:36.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ patches.arch.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch new/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
--- old/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch 2011-09-21 13:20:35.000000000 +0200
@@ -0,0 +1,453 @@
+Subject: ACPI: Implement overriding of arbitrary ACPI tables via initrd
+From: Thomas Renninger
+References: none
+Patch-Mainline: submitted, aiming for 3.2
+
+Details can be found in:
+Documentation/acpi/initrd_table_override.txt
+
+Additional dmesg output of a booted system with
+FACP (FADT), DSDT and SSDT (the 9th dynamically loaded one)
+tables overridden (with ### marked comments):
+
+### ACPI tables found glued to initrd
+DSDT ACPI table found in initrd - size: 16234
+FACP ACPI table found in initrd - size: 116
+SSDT ACPI table found in initrd - size: 334
+### Re-printed e820 map via e820_update() with additionally created
+### ACPI data section at 0xcff55000 where the ACPI tables passed via
+### initrd where copied to
+modified physical RAM map:
+...
+ ### New ACPI data section:
+ modified: 00000000cff55000 - 00000000cff5912c (ACPI data)
+ ### BIOS e820 provided ACPI data section:
+ modified: 00000000cff60000 - 00000000cff69000 (ACPI data)
+...
+### Total size of all ACPI tables glued to initrd
+### The address is initrd_start which gets updated to
+### initrd_start = initrd_start + "size of all ACPI tables glued to initrd"
+Found acpi tables of size: 16684 at 0xffff8800374c4000
+
+Disabling lock debugging due to kernel taint
+### initrd provided FACP and DSDT tables are used instead of BIOS provided ones
+ACPI: FACP @ 0x00000000cff68dd8 Phys table override, replaced with:
+ACPI: FACP 00000000cff58f6a 00074 (v01 INTEL TUMWATER 06040000 PTL 00000003)
+ACPI: DSDT @ 0x00000000cff649d4 Phys table override, replaced with:
+ACPI: DSDT 00000000cff55000 04404 (v01 Intel BLAKFORD 06040000 MSFT 0100000E)
+...
+### Much later, the 9th (/sys/firmware/acpi/table/dynamic/SSDT9) dynamically
+### loaded ACPI table matches and gets overridden:
+ACPI: SSDT @ 0x00000000cff64824 Phys table override, replaced with:
+ACPI: SSDT 00000000cff58fde 0014E (v01 PmRef Cpu7Ist 00003000 INTL 20110316)
+ACPI: Dynamic OEM Table Load:
+ACPI: SSDT (null) 0014E (v01 PmRef Cpu7Ist 00003000 INTL 20110316)
+...
+
+If the initrd does not start with a valid ACPI table signature or the ACPI
+table's checksum is wrong, there is no functional change.
+
+Signed-off-by: Thomas Renninger
+CC: linux-acpi@vger.kernel.org
+CC: lenb@kernel.org
+CC: linux-kernel@vger.kernel.org
+CC: x86@kernel.org
+---
+ Documentation/acpi/initrd_table_override.txt | 110 +++++++++++++++++++
+ arch/x86/kernel/setup.c | 18 ++-
+ arch/x86/mm/init.c | 6 +
+ drivers/acpi/Kconfig | 10 +
+ drivers/acpi/osl.c | 150 ++++++++++++++++++++++++++-
+ include/linux/acpi.h | 4
+ include/linux/initrd.h | 3
+ 7 files changed, 293 insertions(+), 8 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+
+Index: linux-3.1-rc6-master/Documentation/acpi/initrd_table_override.txt
+===================================================================
+--- /dev/null
++++ linux-3.1-rc6-master/Documentation/acpi/initrd_table_override.txt
+@@ -0,0 +1,110 @@
++Overriding ACPI tables via initrd
++=================================
++
++1) Introduction (What is this about)
++2) What is this for
++3) How does it work
++4) References (Where to retrieve userspace tools)
++
++1) What is this about
++---------------------
++
++If ACPI_INITRD_TABLE_OVERRIDE compile option is true, it is possible to
++override nearly any ACPI table provided by the BIOS with an instrumented,
++modified one.
++
++Up to 10 arbitrary ACPI tables can be passed.
++For a full list of ACPI tables that can be overridden, take a look at
++the char *table_sigs[MAX_ACPI_SIGNATURE]; definition in drivers/acpi/osl.c
++All ACPI tables iasl (Intel's ACPI compiler and disassembler) knows should
++be overridable, except:
++ - ACPI_SIG_RSDP (has a signature of 6 bytes)
++ - ACPI_SIG_FACS (does not have an ordinary ACPI table header)
++Both could get implemented as well.
++
++
++2) What is this for
++-------------------
++
++Please keep in mind that this is a debug option.
++ACPI tables should not get overridden for productive use.
++If BIOS ACPI tables are overridden the kernel will get tainted with the
++TAINT_OVERRIDDEN_ACPI_TABLE flag.
++Complain to your platform/BIOS vendor if you find a bug which is that sever
++that a workaround is not accepted in the Linus kernel.
++
++Still, it can and should be enabled in any kernel, because:
++ - There is no functional change with not instrumented initrds
++ - It provides a powerful feature to easily debug and test ACPI BIOS table
++ compatibility with the Linux kernel.
++
++Until now it was only possible to override the DSDT by compiling it into
++the kernel. This is a nightmare when trying to work on ACPI related bugs
++and a lot bugs got stuck because of that.
++Even for people with enough kernel knowledge, building a kernel to try out
++things is very time consuming. Also people may have to browse and modify the
++ACPI interpreter code to find a possible BIOS bug. With this feature, people
++can correct the ACPI tables and try out quickly whether this is the root cause
++that needs to get addressed in the kernel.
++
++This could even ease up testing for BIOS providers who could flush their BIOS
++to test, but overriding table via initrd is much easier and quicker.
++For example one could prepare different initrds overriding NUMA tables with
++different affinity settings. Set up a script, let the machine reboot and
++run tests over night and one can get a picture how these settings influence
++the Linux kernel and which values are best.
++
++People can instrument the dynamic ACPI (ASL) code (for example with debug
++statements showing up in syslog when the ACPI code is processed, etc.),
++to better understand BIOS to OS interfaces, to hunt down ACPI BIOS code related
++bugs quickly or to easier develop ACPI based drivers.
++
++Intstrumenting ACPI code in SSDTs is now much easier. Before, one had to copy
++all SSDTs into the DSDT to compile it into the kernel for testing
++(because only DSDT could get overridden). That's what the acpi_no_auto_ssdt
++boot param is for: the BIOS provided SSDTs are ignored and all have to get
++copied into the DSDT, complicated and time consuming.
++
++Much more use cases, depending on which ACPI parts you are working on...
++
++
++3) How does it work
++-------------------
++
++# Extract the machine's ACPI tables:
++acpidump >acpidump
++acpixtract -a acpidump
++# Disassemble, modify and recompile them:
++iasl -d *.dat
++# For example add this statement into a _PRT (PCI Routing Table) function
++# of the DSDT:
++Store("Hello World", debug)
++iasl -sa *.dsl
++# glue them together with the initrd. ACPI tables go first, original initrd
++# goes on top:
++cat TBL1.dat >>instrumented_initrd
++cat TBL2.dat >>instrumented_initrd
++cat TBL3.dat >>instrumented_initrd
++cat /boot/initrd >>instrumented_initrd
++# reboot with increased acpi debug level, e.g. boot params:
++acpi.debug_level=0x2 acpi.debug_layer=0xFFFFFFFF
++# and check your syslog:
++[ 1.268089] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]
++[ 1.272091] [ACPI Debug] String [0x0B] "HELLO WORLD"
++
++iasl is able to disassemble and recompile quite a lot different,
++also static ACPI tables.
++
++4) Where to retrieve userspace tools
++------------------------------------
++
++iasl and acpixtract are part of Intel's ACPICA project:
++http://acpica.org/
++and should be packaged by distributions (for example in the acpica package
++on SUSE).
++
++acpidump can be found in Len Browns pmtools:
++ftp://kernel.org/pub/linux/kernel/people/lenb/acpi/utils/pmtools/acpidump
++This tool is also part of the acpica package on SUSE.
++Alternatively used ACPI tables can be retrieved via sysfs in latest kernels:
++/sys/firmware/acpi/tables
+Index: linux-3.1-rc6-master/arch/x86/kernel/setup.c
+===================================================================
+--- linux-3.1-rc6-master.orig/arch/x86/kernel/setup.c
++++ linux-3.1-rc6-master/arch/x86/kernel/setup.c
+@@ -411,12 +411,20 @@ static void __init reserve_initrd(void)
+ */
+ initrd_start = ramdisk_image + PAGE_OFFSET;
+ initrd_end = initrd_start + ramdisk_size;
+- return;
++ } else {
++ relocate_initrd();
++ memblock_x86_free_range(ramdisk_image, ramdisk_end);
+ }
+-
+- relocate_initrd();
+-
+- memblock_x86_free_range(ramdisk_image, ramdisk_end);
++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++ acpi_initrd_offset = acpi_initrd_table_override((void *)initrd_start,
++ (void *)initrd_end);
++ if (!acpi_initrd_offset)
++ return;
++ printk(KERN_INFO "Found acpi tables of size: %lu at 0x%lx\n",
++ acpi_initrd_offset, initrd_start);
++ initrd_start += acpi_initrd_offset;
++ return;
++#endif
+ }
+ #else
+ static void __init reserve_initrd(void)
+Index: linux-3.1-rc6-master/arch/x86/mm/init.c
+===================================================================
+--- linux-3.1-rc6-master.orig/arch/x86/mm/init.c
++++ linux-3.1-rc6-master/arch/x86/mm/init.c
+@@ -390,6 +390,12 @@ void free_initrd_mem(unsigned long start
+ * - relocate_initrd()
+ * So here We can do PAGE_ALIGN() safely to get partial page to be freed
+ */
++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++ if (acpi_initrd_offset)
++ free_init_pages("initrd memory", start - acpi_initrd_offset,
++ PAGE_ALIGN(end));
++ else
++#endif
+ free_init_pages("initrd memory", start, PAGE_ALIGN(end));
+ }
+ #endif
+Index: linux-3.1-rc6-master/drivers/acpi/Kconfig
+===================================================================
+--- linux-3.1-rc6-master.orig/drivers/acpi/Kconfig
++++ linux-3.1-rc6-master/drivers/acpi/Kconfig
+@@ -261,6 +261,16 @@ config ACPI_CUSTOM_DSDT
+ bool
+ default ACPI_CUSTOM_DSDT_FILE != ""
+
++config ACPI_INITRD_TABLE_OVERRIDE
++ bool
++ depends on X86
++ default y
++ help
++ This option provides functionality to override arbitrary ACPI tables
++ via initrd. No functional change if no ACPI tables are glued to the
++ initrd, therefore it's safe to say Y.
++ See Documentation/acpi/initrd_table_override.txt for details
++
+ config ACPI_BLACKLIST_YEAR
+ int "Disable ACPI for systems before Jan 1st this year" if X86_32
+ default 0
+Index: linux-3.1-rc6-master/drivers/acpi/osl.c
+===================================================================
+--- linux-3.1-rc6-master.orig/drivers/acpi/osl.c
++++ linux-3.1-rc6-master/drivers/acpi/osl.c
+@@ -44,6 +44,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+@@ -499,6 +500,109 @@ acpi_os_predefined_override(const struct
+ return AE_OK;
+ }
+
++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++#include
++
++#define ACPI_OVERRIDE_TABLES 10
++
++static unsigned long acpi_table_override_offset[ACPI_OVERRIDE_TABLES];
++static u64 acpi_tables_inram;
++
++unsigned long __initdata acpi_initrd_offset;
++
++/* Copied from acpica/tbutils.c:acpi_tb_checksum() */
++u8 __init acpi_table_checksum(u8 *buffer, u32 length)
++{
++ u8 sum = 0;
++ u8 *end = buffer + length;
++
++ while (buffer < end)
++ sum = (u8) (sum + *(buffer++));
++ return sum;
++}
++
++/* All but ACPI_SIG_RSDP and ACPI_SIG_FACS: */
++#define MAX_ACPI_SIGNATURE 35
++static const char *table_sigs[MAX_ACPI_SIGNATURE] = {
++ ACPI_SIG_BERT, ACPI_SIG_CPEP, ACPI_SIG_ECDT, ACPI_SIG_EINJ,
++ ACPI_SIG_ERST, ACPI_SIG_HEST, ACPI_SIG_MADT, ACPI_SIG_MSCT,
++ ACPI_SIG_SBST, ACPI_SIG_SLIT, ACPI_SIG_SRAT, ACPI_SIG_ASF,
++ ACPI_SIG_BOOT, ACPI_SIG_DBGP, ACPI_SIG_DMAR, ACPI_SIG_HPET,
++ ACPI_SIG_IBFT, ACPI_SIG_IVRS, ACPI_SIG_MCFG, ACPI_SIG_MCHI,
++ ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA,
++ ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,
++ ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,
++ ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT };
++
++int __init acpi_initrd_table_override(void *start_addr, void *end_addr)
++{
++ int table_nr, sig;
++ unsigned long offset = 0, max_len = end_addr - start_addr;
++ char *p;
++
++ for (table_nr = 0; table_nr < ACPI_OVERRIDE_TABLES; table_nr++) {
++ struct acpi_table_header *table;
++ if (max_len < offset + sizeof(struct acpi_table_header)) {
++ WARN_ON(1);
++ return 0;
++ }
++ table = start_addr + offset;
++
++ for (sig = 0; sig < MAX_ACPI_SIGNATURE; sig++)
++ if (!memcmp(table->signature, table_sigs[sig], 4))
++ break;
++
++ if (sig >= MAX_ACPI_SIGNATURE)
++ break;
++
++ if (max_len < offset + table->length) {
++ WARN_ON(1);
++ return 0;
++ }
++
++ if (acpi_table_checksum(start_addr + offset, table->length)) {
++ WARN(1, "%4.4s has invalid checksum\n",
++ table->signature);
++ continue;
++ }
++ printk(KERN_INFO "%4.4s ACPI table found in initrd"
++ " - size: %d\n", table->signature, table->length);
++
++ offset += table->length;
++ acpi_table_override_offset[table_nr] = offset;
++ }
++ if (!offset)
++ return 0;
++
++ acpi_tables_inram =
++ memblock_find_in_range(0, max_low_pfn_mapped << PAGE_SHIFT,
++ offset, PAGE_SIZE);
++ if (acpi_tables_inram == MEMBLOCK_ERROR)
++ panic("Cannot find place for ACPI override tables\n");
++
++ /*
++ * Only calling e820_add_reserve does not work and the
++ * tables are invalid (memory got used) later.
++ * memblock_x86_reserve_range works as expected and the tables
++ * won't get modified. But it's not enough because ioremap will
++ * complain later (used by acpi_os_map_memory) that the pages
++ * that should get mapped are not marked "reserved".
++ * Both memblock_x86_reserve_range and e820_add_region works fine.
++ */
++ memblock_x86_reserve_range(acpi_tables_inram,
++ acpi_tables_inram + offset,
++ "ACPI TABLE OVERRIDE");
++ e820_add_region(acpi_tables_inram, offset, E820_ACPI);
++ update_e820();
++
++ p = early_ioremap(acpi_tables_inram, offset);
++ memcpy(p, start_addr, offset);
++ early_iounmap(p, offset);
++ return offset;
++}
++
++#endif
++
+ acpi_status
+ acpi_os_table_override(struct acpi_table_header * existing_table,
+ struct acpi_table_header ** new_table)
+@@ -526,11 +630,51 @@ acpi_status
+ acpi_os_phys_table_override(struct acpi_table_header *existing_table,
+ acpi_physical_address *address, u32 *table_length)
+ {
+- if (!existing_table)
+- return AE_BAD_PARAMETER;
+
+- table_length = 0;
++#ifndef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++ *table_length = 0;
++ *address = 0;
+ return AE_OK;
++#else
++ int table_nr = 0;
++ *table_length = 0;
++ *address = 0;
++ for (; table_nr < ACPI_OVERRIDE_TABLES &&
++ acpi_table_override_offset[table_nr]; table_nr++) {
++ int table_offset;
++ int table_len;
++ struct acpi_table_header *table;
++
++ if (table_nr == 0)
++ table_offset = 0;
++ else
++ table_offset = acpi_table_override_offset[table_nr - 1];
++
++ table_len = acpi_table_override_offset[table_nr] - table_offset;
++
++ table = acpi_os_map_memory(acpi_tables_inram + table_offset,
++ table_len);
++
++ if (memcmp(existing_table->signature, table->signature, 4)) {
++ acpi_os_unmap_memory(table, table_len);
++ continue;
++ }
++
++ /* Only override tables with matching oem id */
++ if (memcmp(table->oem_table_id, existing_table->oem_table_id,
++ ACPI_OEM_TABLE_ID_SIZE)) {
++ acpi_os_unmap_memory(table, table_len);
++ continue;
++ }
++
++ acpi_os_unmap_memory(table, table_len);
++ *address = acpi_tables_inram + table_offset;
++ *table_length = table_len;
++ add_taint(TAINT_OVERRIDDEN_ACPI_TABLE);
++ break;
++ }
++ return AE_OK;
++#endif
+ }
+
+ static irqreturn_t acpi_irq(int irq, void *dev_id)
+Index: linux-3.1-rc6-master/include/linux/acpi.h
+===================================================================
+--- linux-3.1-rc6-master.orig/include/linux/acpi.h
++++ linux-3.1-rc6-master/include/linux/acpi.h
+@@ -76,6 +76,10 @@ typedef int (*acpi_table_handler) (struc
+
+ typedef int (*acpi_table_entry_handler) (struct acpi_subtable_header *header, const unsigned long end);
+
++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++int __init acpi_initrd_table_override(void *start_addr, void *end_addr);
++#endif
++
+ char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
+ void __acpi_unmap_table(char *map, unsigned long size);
+ int early_acpi_boot_init(void);
+Index: linux-3.1-rc6-master/include/linux/initrd.h
+===================================================================
+--- linux-3.1-rc6-master.orig/include/linux/initrd.h
++++ linux-3.1-rc6-master/include/linux/initrd.h
+@@ -16,5 +16,8 @@ extern int initrd_below_start_ok;
+ /* free_initrd_mem always gets called with the next two as arguments.. */
+ extern unsigned long initrd_start, initrd_end;
+ extern void free_initrd_mem(unsigned long, unsigned long);
++#ifdef CONFIG_ACPI_INITRD_TABLE_OVERRIDE
++extern unsigned long acpi_initrd_offset;
++#endif
+
+ extern unsigned int real_root_dev;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch new/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch
--- old/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch 2011-09-21 13:20:35.000000000 +0200
@@ -0,0 +1,45 @@
+Subject: ACPICA: Fix wrongly mapped acpi table header when overriding via initrd
+From: Michael Chang
+References: none
+Patch-Mainline: submitted, aiming for 3.2
+
+Fix the overriding ACPI table header do not override the existing ACPI
+header thus the existing one is still in use. This caused a discrepency
+of header and body, which would introdce a serios side effect that when
+overriding DSDT, system might have error with "Unable to load the System
+Description Tables" due to DSDT table verified failed.
+
+Most field in ACPI table is static, but the length field is dyamically
+changed and corresponds the new assembled *.aml size. We reserve the
+ACPI data region using the overridden table size but attemps to map it
+with existing ACPI table size introduced by above discrepency. It
+would lead to remap fail during verifying DSDT able if length difference
+cross a page boundary.
+
+Signed-off-by: Michael Chang
+---
+ drivers/acpi/acpica/tbutils.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
+index df85afe..2e797d9 100644
+--- a/drivers/acpi/acpica/tbutils.c
++++ b/drivers/acpi/acpica/tbutils.c
+@@ -511,9 +511,9 @@ acpi_tb_install_table(acpi_physical_address address,
+ ACPI_CAST_PTR(void, address)));
+ acpi_os_unmap_memory(mapped_table,
+ sizeof(struct acpi_table_header));
++ address = tmp_addr;
+ mapped_table = acpi_os_map_memory(address,
+ sizeof(struct acpi_table_header));
+- address = tmp_addr;
+ }
+ flags = ACPI_TABLE_ORIGIN_MAPPED;
+ table_to_install = mapped_table;
+--
+1.7.3.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch new/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch
--- old/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch 2011-09-21 13:20:35.000000000 +0200
@@ -0,0 +1,129 @@
+Subject: ACPICA: Introduce acpi_os_phys_table_override function
+From: Thomas Renninger
+References: none
+Patch-Mainline: submitted, aiming for 3.2
+
+Currently it's only possible to feed acpica with virtual
+address for table overriding.
+This patch introduces a function which allows the OS to
+pass physical addresses for table overriding.
+
+This is necessary to allow early table overridings of
+arbitrary ACPI tables.
+
+An extra flag like ACPI_TABLE_ORIGIN_OVERRIDE is not used,
+because physical address overriding is rather transparent
+(the same way acpica expects to get tables from reserved
+memory BIOS regions which is the normal way).
+
+Signed-off-by: Thomas Renninger
+CC: devel@acpica.org
+CC: linux-acpi@vger.kernel.org
+CC: lenb@kernel.org
+---
+ drivers/acpi/acpica/tbinstal.c | 15 +++++++++++++++
+ drivers/acpi/acpica/tbutils.c | 18 +++++++++++++++++-
+ drivers/acpi/osl.c | 11 +++++++++++
+ include/acpi/acpiosxf.h | 4 ++++
+ 4 files changed, 47 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
+index 62365f6..b9b9d2a 100644
+--- a/drivers/acpi/acpica/tbinstal.c
++++ b/drivers/acpi/acpica/tbinstal.c
+@@ -242,6 +242,21 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
+ table_desc->pointer = override_table;
+ table_desc->length = override_table->length;
+ table_desc->flags = ACPI_TABLE_ORIGIN_OVERRIDE;
++ } else {
++ acpi_physical_address address = 0;
++ u32 table_len = 0;
++ status = acpi_os_phys_table_override(table_desc->pointer,
++ &address, &table_len);
++ if (ACPI_SUCCESS(status) && table_len && address) {
++ ACPI_INFO((AE_INFO, "%4.4s @ 0x%p "
++ "Phys table override, replaced with:",
++ table_desc->pointer->signature,
++ ACPI_CAST_PTR(void, table_desc->address)));
++ table_desc->address = address;
++ table_desc->pointer = acpi_os_map_memory(address,
++ table_len);
++ table_desc->length = table_len;
++ }
+ }
+
+ /* Add the table to the global root table list */
+diff --git a/drivers/acpi/acpica/tbutils.c b/drivers/acpi/acpica/tbutils.c
+index 0f2d395..df85afe 100644
+--- a/drivers/acpi/acpica/tbutils.c
++++ b/drivers/acpi/acpica/tbutils.c
+@@ -499,8 +499,24 @@ acpi_tb_install_table(acpi_physical_address address,
+ table_to_install = override_table;
+ flags = ACPI_TABLE_ORIGIN_OVERRIDE;
+ } else {
+- table_to_install = mapped_table;
++ u32 table_len = 0;
++ acpi_physical_address tmp_addr = 0;
++
++ status = acpi_os_phys_table_override(mapped_table,
++ &tmp_addr, &table_len);
++ if (ACPI_SUCCESS(status) && table_len && tmp_addr) {
++ ACPI_INFO((AE_INFO, "%4.4s @ 0x%p "
++ "Phys table override, replaced with:",
++ mapped_table->signature,
++ ACPI_CAST_PTR(void, address)));
++ acpi_os_unmap_memory(mapped_table,
++ sizeof(struct acpi_table_header));
++ mapped_table = acpi_os_map_memory(address,
++ sizeof(struct acpi_table_header));
++ address = tmp_addr;
++ }
+ flags = ACPI_TABLE_ORIGIN_MAPPED;
++ table_to_install = mapped_table;
+ }
+
+ /* Initialize the table entry */
+diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
+index fa32f58..49b5fa6 100644
+--- a/drivers/acpi/osl.c
++++ b/drivers/acpi/osl.c
+@@ -522,6 +522,17 @@ acpi_os_table_override(struct acpi_table_header * existing_table,
+ return AE_OK;
+ }
+
++acpi_status
++acpi_os_phys_table_override(struct acpi_table_header *existing_table,
++ acpi_physical_address *address, u32 *table_length)
++{
++ if (!existing_table)
++ return AE_BAD_PARAMETER;
++
++ table_length = 0;
++ return AE_OK;
++}
++
+ static irqreturn_t acpi_irq(int irq, void *dev_id)
+ {
+ u32 handled;
+diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
+index 4543b6f..0bef969 100644
+--- a/include/acpi/acpiosxf.h
++++ b/include/acpi/acpiosxf.h
+@@ -95,6 +95,10 @@ acpi_status
+ acpi_os_table_override(struct acpi_table_header *existing_table,
+ struct acpi_table_header **new_table);
+
++acpi_status
++acpi_os_phys_table_override(struct acpi_table_header *existing_table,
++ acpi_physical_address *address, u32 *table_length);
++
+ /*
+ * Spinlock primitives
+ */
+--
+1.7.3.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
+the body of a message to majordomo@vger.kernel.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/apei_allow_drivers_access_nvs_ram.patch new/patches.drivers/apei_allow_drivers_access_nvs_ram.patch
--- old/patches.drivers/apei_allow_drivers_access_nvs_ram.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/apei_allow_drivers_access_nvs_ram.patch 2011-09-20 18:09:04.000000000 +0200
@@ -0,0 +1,28 @@
+From: Yinghai Lu
+Subject: [PATCH] x86: allow NVS can be accessed by driver
+References: none
+Patch-Mainline: submitted, aiming for 3.2
+
+APEI related...
+
+Signed-off-by: Yinghai Lu
+Signed-off-by: Thomas Renninger
+
+---
+ arch/x86/kernel/e820.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux-2.6/arch/x86/kernel/e820.c
+===================================================================
+--- linux-2.6.orig/arch/x86/kernel/e820.c
++++ linux-2.6/arch/x86/kernel/e820.c
+@@ -995,7 +995,8 @@ void __init e820_reserve_resources(void)
+ * pcibios_resource_survey()
+ */
+ if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20)) {
+- res->flags |= IORESOURCE_BUSY;
++ if (e820.map[i].type != E820_NVS)
++ res->flags |= IORESOURCE_BUSY;
+ insert_resource(&iomem_resource, res);
+ }
+ res++;
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/SUSE-bootsplash new/patches.suse/SUSE-bootsplash
--- old/patches.suse/SUSE-bootsplash 2011-09-15 09:30:03.000000000 +0200
+++ new/patches.suse/SUSE-bootsplash 2011-09-27 22:27:57.000000000 +0200
@@ -17,6 +17,9 @@
These framebuffers are rare these days, the legendary and still
popular server chipset Radeon ES1000 supports it, though.
+ * Fix crash when updating boxes:
+ Don't reallocate picture.
+
Signed-off-by: Egbert Eich
---
drivers/tty/n_tty.c | 11
@@ -26,17 +29,17 @@
drivers/video/Makefile | 1
drivers/video/bootsplash/Kconfig | 17
drivers/video/bootsplash/Makefile | 5
- drivers/video/bootsplash/bootsplash.c | 2416 ++++++++++++++++++++++++++++++++++
- drivers/video/bootsplash/decode-jpg.c | 998 ++++++++++++++
- drivers/video/bootsplash/decode-jpg.h | 36
+ drivers/video/bootsplash/bootsplash.c | 2473 ++++++++++++++++++++++++++++++++++
+ drivers/video/bootsplash/decode-jpg.c | 1045 ++++++++++++++
+ drivers/video/bootsplash/decode-jpg.h | 37
drivers/video/bootsplash/render.c | 491 ++++++
drivers/video/console/bitblit.c | 31
drivers/video/console/fbcon.c | 58
drivers/video/console/fbcon.h | 47
- include/linux/bootsplash.h | 76 +
+ include/linux/bootsplash.h | 86 +
include/linux/console_struct.h | 3
include/linux/fb.h | 4
- 17 files changed, 4236 insertions(+)
+ 17 files changed, 4351 insertions(+)
create mode 100644 drivers/video/bootsplash/Kconfig
create mode 100644 drivers/video/bootsplash/Makefile
create mode 100644 drivers/video/bootsplash/bootsplash.c
@@ -45,10 +48,8 @@
create mode 100644 drivers/video/bootsplash/render.c
create mode 100644 include/linux/bootsplash.h
-Index: linux-3.0-master/drivers/tty/n_tty.c
-===================================================================
---- linux-3.0-master.orig/drivers/tty/n_tty.c
-+++ linux-3.0-master/drivers/tty/n_tty.c
+--- linux-3.1-rc6-master.orig/drivers/tty/n_tty.c
++++ linux-3.1-rc6-master/drivers/tty/n_tty.c
@@ -50,6 +50,8 @@
#include
#include
@@ -74,10 +75,8 @@
if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
retval = -EIO;
break;
-Index: linux-3.0-master/drivers/tty/vt/keyboard.c
-===================================================================
---- linux-3.0-master.orig/drivers/tty/vt/keyboard.c
-+++ linux-3.0-master/drivers/tty/vt/keyboard.c
+--- linux-3.1-rc6-master.orig/drivers/tty/vt/keyboard.c
++++ linux-3.1-rc6-master/drivers/tty/vt/keyboard.c
@@ -43,6 +43,8 @@
#include
#include
@@ -101,10 +100,8 @@
#ifdef CONFIG_SPARC
if (keycode == KEY_A && sparc_l1_a_state) {
sparc_l1_a_state = false;
-Index: linux-3.0-master/drivers/tty/vt/vt.c
-===================================================================
---- linux-3.0-master.orig/drivers/tty/vt/vt.c
-+++ linux-3.0-master/drivers/tty/vt/vt.c
+--- linux-3.1-rc6-master.orig/drivers/tty/vt/vt.c
++++ linux-3.1-rc6-master/drivers/tty/vt/vt.c
@@ -4204,6 +4204,35 @@ void vcs_scr_updated(struct vc_data *vc)
notify_update(vc);
}
@@ -141,10 +138,8 @@
/*
* Visible symbols for modules
*/
-Index: linux-3.0-master/drivers/video/Kconfig
-===================================================================
---- linux-3.0-master.orig/drivers/video/Kconfig
-+++ linux-3.0-master/drivers/video/Kconfig
+--- linux-3.1-rc6-master.orig/drivers/video/Kconfig
++++ linux-3.1-rc6-master/drivers/video/Kconfig
@@ -2397,4 +2397,8 @@ if FB || SGI_NEWPORT_CONSOLE
source "drivers/video/logo/Kconfig"
endif
@@ -154,10 +149,8 @@
+endif
+
endmenu
-Index: linux-3.0-master/drivers/video/Makefile
-===================================================================
---- linux-3.0-master.orig/drivers/video/Makefile
-+++ linux-3.0-master/drivers/video/Makefile
+--- linux-3.1-rc6-master.orig/drivers/video/Makefile
++++ linux-3.1-rc6-master/drivers/video/Makefile
@@ -14,6 +14,7 @@ fb-objs := $(f
obj-$(CONFIG_VT) += console/
obj-$(CONFIG_LOGO) += logo/
@@ -166,10 +159,8 @@
obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfillrect.o
obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o
-Index: linux-3.0-master/drivers/video/bootsplash/Kconfig
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/Kconfig
++++ linux-3.1-rc6-master/drivers/video/bootsplash/Kconfig
@@ -0,0 +1,17 @@
+#
+# Bootsplash configuration
@@ -188,21 +179,17 @@
+ If you are unsure, say N
+endmenu
+
-Index: linux-3.0-master/drivers/video/bootsplash/Makefile
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/Makefile
++++ linux-3.1-rc6-master/drivers/video/bootsplash/Makefile
@@ -0,0 +1,5 @@
+# Makefile for the Linux bootsplash
+
+obj-$(CONFIG_BOOTSPLASH) += bootsplash.o
+obj-$(CONFIG_BOOTSPLASH) += decode-jpg.o
+obj-$(CONFIG_BOOTSPLASH) += render.o
-Index: linux-3.0-master/drivers/video/bootsplash/bootsplash.c
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/bootsplash.c
-@@ -0,0 +1,2486 @@
++++ linux-3.1-rc6-master/drivers/video/bootsplash/bootsplash.c
+@@ -0,0 +1,2473 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.c -
+ * splash screen handling functions.
@@ -936,7 +923,7 @@
+ }
+}
+
-+static int get_raw_v2(struct vc_data *vc,
++static int update_boxes(struct vc_data *vc,
+ const int *offsets,
+ unsigned char *ndata, int len, unsigned char * end,
+ int *update)
@@ -1007,19 +994,6 @@
+ }
+ if (update)
+ *update = up;
-+
-+ if (sd->pic->ref_cnt > 1) {
-+ struct splash_pic_data *pic;
-+ pic = kzalloc(sizeof
-+ (struct splash_pic_data),
-+ GFP_KERNEL);
-+ if (!pic)
-+ return -1;
-+ sd->pic = pic;
-+ }
-+ sd->pic->ref_cnt = 1;
-+ sd->pic->splash_pic = NULL;
-+ sd->pic->splash_pic_size = 0;
+ }
+ return 0;
+}
@@ -1095,7 +1069,7 @@
+ * since we can have multiple splash_data records
+ */
+ if (splash_size == (int)0xffffffff && version > 1) {
-+ if (get_raw_v2(vc, offsets, ndata, len, end, update) < 0)
++ if (update_boxes(vc, offsets, ndata, len, end, update) < 0)
+ return -1;
+
+ return unit;
@@ -2689,10 +2663,8 @@
+ }
+ return 0;
+}
-Index: linux-3.0-master/drivers/video/bootsplash/decode-jpg.c
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/decode-jpg.c
++++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.c
@@ -0,0 +1,1045 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.c - a tiny jpeg decoder.
@@ -3739,10 +3711,8 @@
+ outy += 64 * 2 - 16 * 4;
+ }
+}
-Index: linux-3.0-master/drivers/video/bootsplash/decode-jpg.h
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/decode-jpg.h
++++ linux-3.1-rc6-master/drivers/video/bootsplash/decode-jpg.h
@@ -0,0 +1,37 @@
+/*
+ * linux/drivers/video/bootsplash/decode-jpg.h - a tiny jpeg decoder.
@@ -3775,16 +3745,14 @@
+ int dquant[3][64];
+};
+
-+extern int jpeg_decode(unsigned char *buf, unsigned char *pic,
++extern int jpeg_decode(unsigned char *buf, unsigned char *pic,
+ int width, int height, enum splash_color_format cf,
+ struct jpeg_decdata *);
+extern void jpeg_get_size(unsigned char *, int *, int *);
+
+#endif
-Index: linux-3.0-master/drivers/video/bootsplash/render.c
-===================================================================
--- /dev/null
-+++ linux-3.0-master/drivers/video/bootsplash/render.c
++++ linux-3.1-rc6-master/drivers/video/bootsplash/render.c
@@ -0,0 +1,491 @@
+/*
+ * linux/drivers/video/bootsplash/render.c - splash screen render functions.
@@ -4277,10 +4245,8 @@
+ /* update_screen(vc->vc_num); */
+ }
+}
-Index: linux-3.0-master/drivers/video/console/bitblit.c
-===================================================================
---- linux-3.0-master.orig/drivers/video/console/bitblit.c
-+++ linux-3.0-master/drivers/video/console/bitblit.c
+--- linux-3.1-rc6-master.orig/drivers/video/console/bitblit.c
++++ linux-3.1-rc6-master/drivers/video/console/bitblit.c
@@ -19,6 +19,9 @@
#include
#include "fbcon.h"
@@ -4354,10 +4320,8 @@
if (info->fbops->fb_cursor)
err = info->fbops->fb_cursor(info, &cursor);
-Index: linux-3.0-master/drivers/video/console/fbcon.c
-===================================================================
---- linux-3.0-master.orig/drivers/video/console/fbcon.c
-+++ linux-3.0-master/drivers/video/console/fbcon.c
+--- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.c
++++ linux-3.1-rc6-master/drivers/video/console/fbcon.c
@@ -80,6 +80,7 @@
#include
@@ -4487,10 +4451,8 @@
cols /= w;
rows /= h;
vc_resize(vc, cols, rows);
-Index: linux-3.0-master/drivers/video/console/fbcon.h
-===================================================================
---- linux-3.0-master.orig/drivers/video/console/fbcon.h
-+++ linux-3.0-master/drivers/video/console/fbcon.h
+--- linux-3.1-rc6-master.orig/drivers/video/console/fbcon.h
++++ linux-3.1-rc6-master/drivers/video/console/fbcon.h
@@ -25,6 +25,53 @@
* low-level frame buffer device
*/
@@ -4545,10 +4507,8 @@
struct display {
/* Filled in by the low-level console driver */
const u_char *fontdata;
-Index: linux-3.0-master/include/linux/bootsplash.h
-===================================================================
--- /dev/null
-+++ linux-3.0-master/include/linux/bootsplash.h
++++ linux-3.1-rc6-master/include/linux/bootsplash.h
@@ -0,0 +1,86 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition.
@@ -4636,10 +4596,8 @@
+# endif
+
+#endif
-Index: linux-3.0-master/include/linux/console_struct.h
-===================================================================
---- linux-3.0-master.orig/include/linux/console_struct.h
-+++ linux-3.0-master/include/linux/console_struct.h
+--- linux-3.1-rc6-master.orig/include/linux/console_struct.h
++++ linux-3.1-rc6-master/include/linux/console_struct.h
@@ -107,6 +107,9 @@ struct vc_data {
unsigned long vc_uni_pagedir;
unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */
@@ -4650,10 +4608,8 @@
/* additional information is in vt_kern.h */
};
-Index: linux-3.0-master/include/linux/fb.h
-===================================================================
---- linux-3.0-master.orig/include/linux/fb.h
-+++ linux-3.0-master/include/linux/fb.h
+--- linux-3.1-rc6-master.orig/include/linux/fb.h
++++ linux-3.1-rc6-master/include/linux/fb.h
@@ -878,6 +878,10 @@ struct fb_info {
void *fbcon_par; /* fbcon use-only private area */
/* From here on everything is device dependent */
++++++ patches.xen.tar.bz2 ++++++
++++ 26832 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:37.000000000 +0200
+++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:37.000000000 +0200
@@ -215,6 +215,12 @@
# Queued for 2.6.36 -> just revert after some time
patches.fixes/acpi_ec_sys_access_user_space_with_get_user.patch
+ patches.drivers/apei_allow_drivers_access_nvs_ram.patch
+
+ patches.arch/acpica_introduce_acpi_os_phys_table_override_function.patch
+ patches.arch/acpica_fix_wrongly_mapped_acpi_table_header_when_overriding_via_initrd.patch
+ patches.arch/acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
+
########################################################
# CPUFREQ
########################################################
@@ -727,21 +733,14 @@
patches.xen/xen3-patch-2.6.39
patches.xen/xen3-patch-3.0
patches.xen/xen3-patch-3.1-rc5
+ patches.xen/xen3-patch-3.1-rc6-rc7
+ patches.xen/xen3-apei_allow_drivers_access_nvs_ram.patch
+ patches.xen/xen3-acpi_implement_overriding_of_arbitrary_acpi_tables_via_initrd.patch
patches.xen/xen3-stack-unwind
patches.xen/xen3-x86_64-unwind-annotations
# bugfixes and enhancements
- patches.xen/xen-balloon-max-target
- patches.xen/xen-blkif-protocol-fallback-hack
- patches.xen/xen-blkback-cdrom
- patches.xen/xen-blktap-modular
- patches.xen/xen-blktap-write-barriers
- patches.xen/xen-blktap2-configurable-nr-devs
- patches.xen/xen-op-packet
- patches.xen/xen-blkfront-cdrom
- patches.xen/xen-blkfront-hvm-no-cdrom
patches.xen/xen-kconfig-compat
- patches.xen/xen-cpufreq-report
patches.xen/xen-sys-suspend
patches.xen/xen-ipi-per-cpu-irq
patches.xen/xen-virq-per-cpu-irq
@@ -750,7 +749,22 @@
patches.xen/xen-pcpu-hotplug
patches.xen/xen-mem-hotplug
patches.xen/xen-swiotlb-heuristics
+ patches.xen/xen-pci-multi-segment
patches.xen/xen-configurable-guest-devices
+ patches.xen/xen-setup-gsi
+ patches.xen/xen-kzalloc
+ patches.xen/xen-sections
+ patches.xen/xen-unpriv-build
+ patches.xen/xen-cpufreq-report
+ patches.xen/xen-balloon-max-target
+ patches.xen/xen-blkif-protocol-fallback-hack
+ patches.xen/xen-blkback-cdrom
+ patches.xen/xen-blktap-modular
+ patches.xen/xen-blktap-write-barriers
+ patches.xen/xen-blktap2-configurable-nr-devs
+ patches.xen/xen-op-packet
+ patches.xen/xen-blkfront-cdrom
+ patches.xen/xen-blkfront-hvm-no-cdrom
patches.xen/xen-netback-nr-irqs
patches.xen/xen-netback-notify-multi
patches.xen/xen-netback-generalize
@@ -759,10 +773,6 @@
patches.xen/xen-cxgb3
patches.xen/xen-dcdbas
patches.xen/xen-floppy
- patches.xen/xen-sections
- patches.xen/xen-kzalloc
- patches.xen/xen-unpriv-build
- patches.xen/xen-setup-gsi
patches.xen/xen-x86-panic-no-reboot
patches.xen/xen-x86-dcr-fallback
patches.xen/xen-x86-no-lapic
@@ -772,7 +782,6 @@
patches.xen/xen-x86-per-cpu-vcpu-info
patches.xen/xen-x86-msr-on-pcpu
patches.xen/xen-x86-EFI
- patches.xen/xen-x86-mmcfg-ACPI-reserved
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.AGU36g/_old 2011-09-28 15:01:38.000000000 +0200
+++ /var/tmp/diff_new_pack.AGU36g/_new 2011-09-28 15:01:38.000000000 +0200
@@ -1,3 +1,3 @@
-2011-09-15 22:18:41 +0200
-GIT Revision: 532c24ffdc1e085588774cecacdc52535bddc3a1
+2011-09-27 22:27:57 +0200
+GIT Revision: ba0cfdcb4a536831694e3844d9ecdb3870506e6b
GIT Branch: master
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org