Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri May 22 16:27:27 CEST 2009. -------- --- kernel-source/kernel-debug.changes 2009-05-19 18:06:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2009-05-22 15:53:46.000000000 +0200 @@ -1,0 +2,36 @@ +Fri May 22 15:47:01 CEST 2009 - teheo@suse.de + +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. + +------------------------------------------------------------------- +Fri May 22 12:42:36 CEST 2009 - mmarek@suse.cz + +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. + +------------------------------------------------------------------- +Fri May 22 11:45:41 CEST 2009 - mmarek@suse.cz + +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. + +------------------------------------------------------------------- +Wed May 20 16:05:07 CEST 2009 - mmarek@suse.cz + +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. + +------------------------------------------------------------------- +Tue May 19 21:42:45 CEST 2009 - sdietrich@suse.de + +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. + +------------------------------------------------------------------- +Tue May 19 18:24:46 CEST 2009 - jblunck@suse.de + +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-kdump.changes: same change kernel-legacy.changes: same change kernel-ppc64.changes: same change kernel-ps3.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: ---- get_release_number.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:12.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:12.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -790,6 +790,24 @@ %endif %changelog +* Fri May 22 2009 teheo@suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek@suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek@suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich@suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck@suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm@suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm@suse.com kernel-default.spec: same change kernel-kdump.spec: same change ++++++ kernel-legacy.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:13.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-legacy Summary: The Standard Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -659,7 +659,7 @@ %defattr(-, root, root) %package base -Summary: Base Modules of the Standard Kernel +Summary: Base Modules of the Legacy Kernel License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -674,7 +674,9 @@ %endif %description base -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. This package contains only the base modules, required in all installs. @@ -695,7 +697,7 @@ %endif %package extra -Summary: Extra Modules for the Standard Kernel +Summary: Extra Modules for the Legacy Kernel License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ @@ -713,7 +715,9 @@ %endif %description extra -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. This package contains additional modules not supported by Novell. @@ -736,11 +740,13 @@ %package man License: GPL v2 only -Summary: The Standard Kernel +Summary: The Legacy Kernel Group: System/Kernel %description man -The standard kernel for both uniprocessor and multiprocessor systems. +The kernel for both uniprocessor and multiprocessor systems to run on +older hardware. It contains support for ISA devices and has the +Physical Addressing Extension (PAE) feature disabled. @@ -760,7 +766,7 @@ %description devel This package contains files necessary for building kernel modules (and -kernel module packages) against the -default flavor of the kernel. +kernel module packages) against the -legacy flavor of the kernel. @@ -786,6 +792,24 @@ %endif %changelog +* Fri May 22 2009 teheo@suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek@suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek@suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich@suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck@suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm@suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm@suse.com ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:13.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:13.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -853,6 +853,24 @@ %endif %changelog +* Fri May 22 2009 teheo@suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek@suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek@suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich@suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck@suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm@suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm@suse.com kernel-ps3.spec: same change kernel-s390.spec: same change kernel-source.spec: same change ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:14.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:14.000000000 +0200 @@ -33,7 +33,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -102,6 +102,24 @@ %_docdir/%name/README.SUSE %changelog +* Fri May 22 2009 teheo@suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek@suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek@suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich@suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck@suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm@suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm@suse.com ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:15.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:15.000000000 +0200 @@ -62,7 +62,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.30 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -812,6 +812,24 @@ %endif %changelog +* Fri May 22 2009 teheo@suse.de +- patches.arch/i586-unwind-quick-fix: i586-relocs: ignore NONE + relocation. +* Fri May 22 2009 mmarek@suse.cz +- rpm/compute-PATCHVERSION.sh, rpm/mkspec, scripts/tar-up.sh: avoid + unpacking the patches tarballs in compute-PATCHVERSION.sh. +* Fri May 22 2009 mmarek@suse.cz +- rpm/mkspec: add --release option to set a custom release string. +- scripts/tar-up.sh: revive -rs option. +* Wed May 20 2009 mmarek@suse.cz +- patches.arch/acpi_thermal_passive_blacklist.patch, + patches.suse/devtmpfs.patch: fix patches to apply with git-apply. +* Tue May 19 2009 sdietrich@suse.de +- patches.suse/stack-unwind-add-declaration.patch: Fix compile + error when CONFIG_STACK_UNWIND is not set. +* Tue May 19 2009 jblunck@suse.de +- patches.rpmify/arm-arch_include_asm-fix.diff: ARM: move + mach-types.h to arch/include/asm. * Tue May 19 2009 jeffm@suse.com - Set CONFIG_FRAMEBUFFER_CONSOLE=y * Tue May 19 2009 jeffm@suse.com kernel-vanilla.spec: same change kernel-xen.spec: same change ++++++ compute-PATCHVERSION.sh ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:16.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:16.000000000 +0200 @@ -1,16 +1,24 @@ -#! /bin/sh +#! /bin/bash export LANG=POSIX -if ! test -d patches.kernel.org; then - if test -e patches.kernel.org.tar.bz2; then - tar xjf patches.kernel.org.tar.bz2 - trap 'rm -rf patches.kernel.org' EXIT - else - echo "Can't find patches.kernel.org" >&2 - fi +path=(.) +while test $# -gt 0; do + case "$1" in + --patches) + path[${#path[@]}]=$2 + shift 2 + ;; + *) + echo "Usage $0 [--patches <dir>]" >&2 + exit 1 + esac +done +if test "${path[*]}" = "."; then + path=(. ..) fi + source $(dirname $0)/config.sh set -- $(echo $SRCVERSION | sed -ne 's/\([0-9]\+\).\([0-9]\+\).\([0-9]\+\)\(.*\)/\1 \2 \3 \4/p') @@ -21,11 +29,39 @@ EXTRA_SYMBOLS=$(set -- $([ -e $(dirname $0)/extra-symbols ] && cat $(dirname $0)/extra-symbols) ; echo $*) +series=$(mktemp) +tmp_files="$series" +trap 'rm -rf $tmp_files' EXIT +warned=false +while read patch; do + dir=${patch%/*} + for p in "${path[@]}"; do + if test -d "$p/$dir"; then + echo "$p/$patch" + continue 2 + fi + done + for p in "${path[@]}"; do + if test -e "$p/$dir.tar.bz2"; then + echo "unpacking $p/$dir.tar.bz2" >&2 + if ! $warned; then + echo "pass --patches <directory with unpacked tarballs> to avoid this" >&2 + warned=true + fi + tmp_files="$tmp_files $dir" + tar xjf "$p/$dir.tar.bz2" + echo "$patch" + continue 2 + fi + done + echo "Can't find $patch" >&2 + exit 1 +done >"$series" < <($(dirname $0)/guards $EXTRA_SYMBOLS <series.conf) + # Parse all the changes to KERNELRELEASE out of all patches and # convert them to shell code that can be evaluated. Evaluate it. eval "$( - $(dirname $0)/guards $EXTRA_SYMBOLS < series.conf | grep '^patches\.kernel\.org' \ - | xargs awk ' + <"$series" xargs awk ' /^--- |^+++ / \ { M = match($2, /^[^\/]+\/Makefile( \t|$)/) } M && /^+(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)/ \ @@ -33,6 +69,4 @@ ' \ | sed -e 's,^+,,' -e 's, *= *\(.*\),="\1",' )" -KERNELRELEASE="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" - -echo "$KERNELRELEASE" +echo "$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION" ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -1 +1 @@ -2096000 +1048576 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -4,9 +4,16 @@ use warnings; use File::Copy; -use Data::Dumper; +use Getopt::Long; my $dir = "."; +my $rpmrelease; +my $patches=""; + +GetOptions( + "patches=s" => \$patches, + "release=s" => \$rpmrelease +) or die "Usage: $0 [--release <release>] [--patches <dir>]\n"; # flavor -> [supported archs] my %flavor_archs = parse_config_conf(); @@ -24,15 +31,17 @@ # package name -> [summary, description] my %binary_descriptions = parse_descriptions(); -my $patchversion = `$dir/compute-PATCHVERSION.sh`; +$patches="--patches $patches" if $patches; +my $patchversion = `$dir/compute-PATCHVERSION.sh $patches`; chomp $patchversion; -my ($rpmversion, $rpmrelease) = split(/-/, $patchversion, 2); +my $rpmversion; if (defined($rpmrelease)) { - $rpmrelease =~ s/-/./g; - $rpmrelease .= "."; + ($rpmversion = $patchversion) =~ s/-.*//; } else { - $rpmrelease = ""; + ($rpmversion, $rpmrelease) = (split(/-/, $patchversion, 2), ""); } +$rpmrelease =~ s/[^.]$/$&./; +$rpmrelease =~ s/-/./g; my %macros = ( VARIANT => $variant, ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:25.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:25.000000000 +0200 @@ -1 +1 @@ -6000 +6144 ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi_thermal_passive_blacklist.patch new/patches.arch/acpi_thermal_passive_blacklist.patch --- old/patches.arch/acpi_thermal_passive_blacklist.patch 2009-05-05 10:09:06.000000000 +0200 +++ new/patches.arch/acpi_thermal_passive_blacklist.patch 2009-05-22 15:47:06.000000000 +0200 @@ -17,7 +17,7 @@ #include <linux/thermal.h> #include <acpi/acpi_bus.h> @@ -1334,6 +1335,66 @@ static int acpi_thermal_get_info(struct - tz->kelvin_offset = 2732; + tz->kelvin_offset = 2732; } +static struct dmi_system_id thermal_psv_dmi_table[] = { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i586-unwind-quick-fix new/patches.arch/i586-unwind-quick-fix --- old/patches.arch/i586-unwind-quick-fix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/i586-unwind-quick-fix 2009-05-22 15:47:06.000000000 +0200 @@ -0,0 +1,32 @@ +From: Tejun Heo <teheo@suse.de> +Subject: i586-relocs: ignore NONE relocation + +Unwind patches somehow creates R_386_NONE relocation in i586 vmlinux +and relocs can't deal with it. For the time being, just ignore +R_386_NONE. This is just a quick fix till we figure out what is going +on. + +Signed-off-by: Tejun Heo <teheo@suse.de> +Cc: Jan Beulich <JBeulich@novell.com> +--- + arch/x86/boot/compressed/relocs.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +Index: linux-2.6.29-master/arch/x86/boot/compressed/relocs.c +=================================================================== +--- linux-2.6.29-master.orig/arch/x86/boot/compressed/relocs.c ++++ linux-2.6.29-master/arch/x86/boot/compressed/relocs.c +@@ -504,8 +504,11 @@ static void walk_relocs(void (*visit)(El + if (sym->st_shndx == SHN_ABS) { + continue; + } +- if (r_type == R_386_PC32) { +- /* PC relative relocations don't need to be adjusted */ ++ if (r_type == R_386_NONE || r_type == R_386_PC32) { ++ /* ++ * NONE can be ignored and and PC relative ++ * relocations don't need to be adjusted. ++ */ + } + else if (r_type == R_386_32) { + /* Visit relocations that need to be adjusted */ ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/arm-arch_include_asm-fix.diff new/patches.rpmify/arm-arch_include_asm-fix.diff --- old/patches.rpmify/arm-arch_include_asm-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/arm-arch_include_asm-fix.diff 2009-05-19 18:24:54.000000000 +0200 @@ -0,0 +1,48 @@ +From: Jan Blunck <jblunck@suse.de> +Subject: ARM: move mach-types.h to arch/include/asm + +Although all other architecture specific includes where already moved to +arch/include/asm the mach-types.h header was still generated in the old +location. + +Signed-off-by: Jan Blunck <jblunck@suse.de> +--- + arch/arm/Makefile | 4 ++-- + arch/arm/tools/Makefile | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +Index: b/arch/arm/Makefile +=================================================================== +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -214,7 +214,7 @@ archprepare: maketools + + PHONY += maketools FORCE + maketools: include/linux/version.h FORCE +- $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h ++ $(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h + + # Convert bzImage to zImage + bzImage: zImage +@@ -225,7 +225,7 @@ zImage Image xipImage bootpImage uImage: + zinstall install: vmlinux + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ + +-CLEAN_FILES += include/asm-arm/mach-types.h \ ++CLEAN_FILES += arch/arm/include/asm/mach-types.h \ + include/asm-arm/arch include/asm-arm/.arch + + # We use MRPROPER_FILES and CLEAN_FILES now +Index: b/arch/arm/tools/Makefile +=================================================================== +--- a/arch/arm/tools/Makefile ++++ b/arch/arm/tools/Makefile +@@ -4,7 +4,7 @@ + # Copyright (C) 2001 Russell King + # + +-include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types ++arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types + @echo ' Generating $@' + @mkdir -p $(dir $@) + $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/devtmpfs.patch new/patches.suse/devtmpfs.patch --- old/patches.suse/devtmpfs.patch 2009-05-11 19:51:30.000000000 +0200 +++ new/patches.suse/devtmpfs.patch 2009-05-20 16:05:48.000000000 +0200 @@ -1198,7 +1198,7 @@ + devtmpfs_mount("dev"); free_initrd(); #endif - } + } --- a/init/main.c +++ b/init/main.c @@ -64,6 +64,7 @@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/stack-unwind-add-declaration.patch new/patches.suse/stack-unwind-add-declaration.patch --- old/patches.suse/stack-unwind-add-declaration.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/stack-unwind-add-declaration.patch 2009-05-20 16:05:48.000000000 +0200 @@ -0,0 +1,22 @@ +Subject: Fix compile error when CONFIG_STACK_UNWIND is not set +From: Sven-Thorsten Dietrich <sdietrich@suse.de> +Signed-off-by: Sven-Thorsten Dietrich <sdietrich@suse.de> +--- + arch/x86/kernel/dumpstack.h | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: linux-2.6.29-master/arch/x86/kernel/dumpstack.h +=================================================================== +--- linux-2.6.29-master.orig/arch/x86/kernel/dumpstack.h ++++ linux-2.6.29-master/arch/x86/kernel/dumpstack.h +@@ -28,6 +28,10 @@ extern void + show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, + unsigned long *sp, unsigned long bp, char *log_lvl); + ++int try_stack_unwind(struct task_struct *task, struct pt_regs *regs, ++ unsigned long **stack, unsigned long *bp, ++ const struct stacktrace_ops *ops, void *data); ++ + extern unsigned int code_bytes; + extern int kstack_depth_to_print; + ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:29.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:29.000000000 +0200 @@ -49,6 +49,7 @@ patches.kernel.org/arch-include-asm-fixes patches.rpmify/spin_is_contended-fix patches.kernel.org/staging-pci-deps + patches.rpmify/arm-arch_include_asm-fix.diff ######################################################## # kABI consistency patches @@ -585,8 +586,10 @@ ######################################################## patches.suse/crasher-26.diff patches.suse/stack-unwind + patches.suse/stack-unwind-add-declaration.patch patches.suse/no-frame-pointer-select patches.arch/x86_64-unwind-annotations + patches.arch/i586-unwind-quick-fix ######################################################## # Kdump ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.t22230/_old 2009-05-22 16:13:30.000000000 +0200 +++ /var/tmp/diff_new_pack.t22230/_new 2009-05-22 16:13:30.000000000 +0200 @@ -1,3 +1,3 @@ -2009-05-19 18:03:55 +0200 -GIT Revision: 15e77baed5e8a3bf8b01fe7e216779ce8fde3382 +2009-05-22 15:47:06 +0200 +GIT Revision: 004d7f8460e6b2588aae824b928acd18fdb74cb4 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