Thu, 17 Nov 2011 23:46:41 -0600
On Fri, 18 Nov 2011 03:32:33 +0100
Herbert Poetzl <herbert@13thfloor.at> wrote:
> On Thu, Nov 17, 2011 at 03:13:18PM +0100, Herbert Poetzl wrote:
> > On Thu, Nov 17, 2011 at 02:24:19PM +0100, Sebastian Steinhuber wrote:
> >> Hi!
> >> I committed patch-3.0.9-vs2.3.2 to vanilla kernel. The sublevel
> >> changed form 9 to 7 afterwards because of line 167:
> >> +SUBLEVEL = 7
>
> > yes, thanks for reporting, my scripts are obviously
> > not used to the 3.x kernels yet, i.e. I need to do some
> > adjustments there ...
>
> >> Btw, similar issue with patch-3.1.1-vs2.3.2 leading to a
> >> 3.1.11-vs2.3.2 numbering:
> >> line 167: +EXTRAVERSION = 1-vs2.3.2
>
> > I updated the patches in place with a fixed version
> > for now
>
> >> But the compilation of 3.0.9-vs2.3.2 stopped with errors. The full
> >> output of 'make all' is appended to the message.
>
> >> include/linux/vserver/limit_int.h: In function ???__vx_acc_cres???:
> >> include/linux/vserver/limit_int.h:16:1: error: ???vs_debug_cres???
> >> undeclared (first use in this function)
> >> include/linux/vserver/limit_int.h:16:1: note: each undeclared identifier
> >> is reported only once for each function it appears in
> >> include/linux/vserver/limit_int.h: In function ???__vx_add_cres???:
> >> include/linux/vserver/limit_int.h:33:1: error: ???vs_debug_cres???
> >> undeclared (first use in this function)
> >> include/linux/vserver/limit_int.h: In function ???__vx_cres_avail???:
> >> include/linux/vserver/limit_int.h:84:1: error: ???vs_debug_limit???
> >> undeclared (first use in this function)
> >> make[2]: *** [arch/x86/mm/init.o] Fehler 1
> >> make[1]: *** [arch/x86/mm] Fehler 2
> >> make: *** [arch/x86] Fehler 2
>
> >> I'm guessing that there might be a bug. I'm on x86-64,
> >> debian/unstable with patches from
> >> http://vserver.13thfloor.at/Experimental/.
> >> Any hints? Thanks in advance.
>
> > could you upload your .config file somewhere and
> > provide the url (via ML or on irc) please?
>
> issue should be fixed in vs2.3.2.1, no need to upload
> your .config anymore ...
but the "SUBLEVEL = 7" in Makefile is back. i noticed it when diffing
my .config against my .config.old after doing a "make oldconfig". the
attached 3.0.9 patch fixes it.
the "'vs_debug_*' undeclared" compilation errors are gone, but they are now
in patch-3.1.1-vs2.3.2.1.diff. see the attached build log for the exact
compilation errors and the attached 3.1.1 patch that works around them
(identical to my 3.0.9 patch from yesterday). i have not had a chance to
test the resulting kernel.
thanks for your continued work on the linux 3.x patches.
corey
--
undefined@pobox.com
> have fun,
> Herbert
>
> > thanks in advance,
> > Herbert
>
> >> Best regards,
> >> Sebastian
>
> >> make all
> >> scripts/kconfig/conf --silentoldconfig Kconfig
> >> boolean symbol IPV6 tested for 'm'? test forced to 'n'
> >> CHK include/linux/version.h
> >> UPD include/linux/version.h
> >> CHK include/generated/utsrelease.h
> >> UPD include/generated/utsrelease.h
> >> CC kernel/bounds.s
> >> GEN include/generated/bounds.h
> >> CC arch/x86/kernel/asm-offsets.s
> >> GEN include/generated/asm-offsets.h
> >> CALL scripts/checksyscalls.sh
> >> CC scripts/mod/empty.o
> >> HOSTCC scripts/mod/mk_elfconfig
> >> MKELF scripts/mod/elfconfig.h
> >> HOSTCC scripts/mod/file2alias.o
> >> HOSTCC scripts/mod/modpost.o
> >> HOSTCC scripts/mod/sumversion.o
> >> HOSTLD scripts/mod/modpost
> >> HOSTCC scripts/conmakehash
> >> CC init/main.o
> >> CHK include/generated/compile.h
> >> UPD include/generated/compile.h
> >> CC init/version.o
> >> CC init/do_mounts.o
> >> CC init/do_mounts_initrd.o
> >> CC init/do_mounts_md.o
> >> LD init/mounts.o
> >> CC init/initramfs.o
> >> CC init/calibrate.o
> >> LD init/built-in.o
> >> HOSTCC usr/gen_init_cpio
> >> GEN usr/initramfs_data.cpio
> >> AS usr/initramfs_data.o
> >> LD usr/built-in.o
> >> AS arch/x86/crypto/aes-x86_64-asm_64.o
> >> CC arch/x86/crypto/aes_glue.o
> >> AS arch/x86/crypto/aesni-intel_asm.o
> >> CC arch/x86/crypto/aesni-intel_glue.o
> >> CC arch/x86/crypto/fpu.o
> >> LD arch/x86/crypto/aes-x86_64.o
> >> LD arch/x86/crypto/aesni-intel.o
> >> CC arch/x86/crypto/crc32c-intel.o
> >> LD arch/x86/crypto/built-in.o
> >> AS [M] arch/x86/crypto/ghash-clmulni-intel_asm.o
> >> CC [M] arch/x86/crypto/ghash-clmulni-intel_glue.o
> >> AS [M] arch/x86/crypto/salsa20-x86_64-asm_64.o
> >> CC [M] arch/x86/crypto/salsa20_glue.o
> >> AS [M] arch/x86/crypto/twofish-x86_64-asm_64.o
> >> CC [M] arch/x86/crypto/twofish_glue.o
> >> LD [M] arch/x86/crypto/twofish-x86_64.o
> >> LD [M] arch/x86/crypto/salsa20-x86_64.o
> >> LD [M] arch/x86/crypto/ghash-clmulni-intel.o
> >> AS arch/x86/ia32/ia32entry.o
> >> CC arch/x86/ia32/sys_ia32.o
> >> CC arch/x86/ia32/ia32_signal.o
> >> CC arch/x86/ia32/ipc32.o
> >> LD arch/x86/ia32/built-in.o
> >> CC arch/x86/kernel/process_64.o
> >> CC arch/x86/kernel/signal.o
> >> AS arch/x86/kernel/entry_64.o
> >> CC arch/x86/kernel/traps.o
> >> CC arch/x86/kernel/irq.o
> >> CC arch/x86/kernel/irq_64.o
> >> CC arch/x86/kernel/dumpstack_64.o
> >> CC arch/x86/kernel/time.o
> >> CC arch/x86/kernel/ioport.o
> >> CC arch/x86/kernel/ldt.o
> >> CC arch/x86/kernel/dumpstack.o
> >> CC arch/x86/kernel/setup.o
> >> CC arch/x86/kernel/x86_init.o
> >> CC arch/x86/kernel/i8259.o
> >> CC arch/x86/kernel/irqinit.o
> >> CC arch/x86/kernel/jump_label.o
> >> CC arch/x86/kernel/irq_work.o
> >> CC arch/x86/kernel/probe_roms.o
> >> CC arch/x86/kernel/sys_x86_64.o
> >> CC arch/x86/kernel/x8664_ksyms_64.o
> >> CC arch/x86/kernel/syscall_64.o
> >> CC arch/x86/kernel/vsyscall_64.o
> >> CC arch/x86/kernel/vread_tsc_64.o
> >> CC arch/x86/kernel/bootflag.o
> >> CC arch/x86/kernel/e820.o
> >> CC arch/x86/kernel/pci-dma.o
> >> CC arch/x86/kernel/quirks.o
> >> CC arch/x86/kernel/topology.o
> >> CC arch/x86/kernel/kdebugfs.o
> >> CC arch/x86/kernel/alternative.o
> >> CC arch/x86/kernel/i8253.o
> >> CC arch/x86/kernel/pci-nommu.o
> >> CC arch/x86/kernel/hw_breakpoint.o
> >> CC arch/x86/kernel/tsc.o
> >> CC arch/x86/kernel/io_delay.o
> >> CC arch/x86/kernel/rtc.o
> >> CC arch/x86/kernel/pci-iommu_table.o
> >> CC arch/x86/kernel/resource.o
> >> CC arch/x86/kernel/trampoline.o
> >> AS arch/x86/kernel/trampoline_64.o
> >> CC arch/x86/kernel/process.o
> >> CC arch/x86/kernel/i387.o
> >> CC arch/x86/kernel/xsave.o
> >> CC arch/x86/kernel/ptrace.o
> >> CC arch/x86/kernel/tls.o
> >> CC arch/x86/kernel/step.o
> >> CC arch/x86/kernel/tboot.o
> >> CC arch/x86/kernel/i8237.o
> >> CC arch/x86/kernel/acpi/boot.o
> >> CC arch/x86/kernel/acpi/sleep.o
> >> LDS arch/x86/kernel/acpi/realmode/wakeup.lds
> >> AS arch/x86/kernel/acpi/realmode/wakeup.o
> >> CC arch/x86/kernel/acpi/realmode/wakemain.o
> >> CC arch/x86/kernel/acpi/realmode/video-mode.o
> >> AS arch/x86/kernel/acpi/realmode/copy.o
> >> AS arch/x86/kernel/acpi/realmode/bioscall.o
> >> CC arch/x86/kernel/acpi/realmode/regs.o
> >> CC arch/x86/kernel/acpi/realmode/video-vga.o
> >> CC arch/x86/kernel/acpi/realmode/video-vesa.o
> >> CC arch/x86/kernel/acpi/realmode/video-bios.o
> >> LD arch/x86/kernel/acpi/realmode/wakeup.elf
> >> OBJCOPY arch/x86/kernel/acpi/realmode/wakeup.bin
> >> AS arch/x86/kernel/acpi/wakeup_rm.o
> >> AS arch/x86/kernel/acpi/wakeup_64.o
> >> CC arch/x86/kernel/acpi/cstate.o
> >> LD arch/x86/kernel/acpi/built-in.o
> >> CC arch/x86/kernel/apic/apic.o
> >> CC arch/x86/kernel/apic/apic_noop.o
> >> CC arch/x86/kernel/apic/ipi.o
> >> CC arch/x86/kernel/apic/hw_nmi.o
> >> CC arch/x86/kernel/apic/io_apic.o
> >> CC arch/x86/kernel/apic/x2apic_phys.o
> >> CC arch/x86/kernel/apic/x2apic_cluster.o
> >> CC arch/x86/kernel/apic/apic_flat_64.o
> >> CC arch/x86/kernel/apic/probe_64.o
> >> LD arch/x86/kernel/apic/built-in.o
> >> CC arch/x86/kernel/cpu/intel_cacheinfo.o
> >> CC arch/x86/kernel/cpu/scattered.o
> >> CC arch/x86/kernel/cpu/topology.o
> >> CC arch/x86/kernel/cpu/proc.o
> >> MKCAP arch/x86/kernel/cpu/capflags.c
> >> CC arch/x86/kernel/cpu/capflags.o
> >> CC arch/x86/kernel/cpu/powerflags.o
> >> CC arch/x86/kernel/cpu/common.o
> >> CC arch/x86/kernel/cpu/vmware.o
> >> CC arch/x86/kernel/cpu/hypervisor.o
> >> CC arch/x86/kernel/cpu/sched.o
> >> CC arch/x86/kernel/cpu/mshyperv.o
> >> CC arch/x86/kernel/cpu/bugs_64.o
> >> CC arch/x86/kernel/cpu/intel.o
> >> CC arch/x86/kernel/cpu/perf_event.o
> >> CC arch/x86/kernel/cpu/mcheck/mce.o
> >> CC arch/x86/kernel/cpu/mcheck/mce-severity.o
> >> CC arch/x86/kernel/cpu/mcheck/mce_intel.o
> >> CC arch/x86/kernel/cpu/mcheck/threshold.o
> >> CC arch/x86/kernel/cpu/mcheck/therm_throt.o
> >> CC arch/x86/kernel/cpu/mcheck/mce-apei.o
> >> LD arch/x86/kernel/cpu/mcheck/built-in.o
> >> CC arch/x86/kernel/cpu/mtrr/main.o
> >> CC arch/x86/kernel/cpu/mtrr/if.o
> >> CC arch/x86/kernel/cpu/mtrr/generic.o
> >> CC arch/x86/kernel/cpu/mtrr/cleanup.o
> >> LD arch/x86/kernel/cpu/mtrr/built-in.o
> >> CC arch/x86/kernel/cpu/perfctr-watchdog.o
> >> LD arch/x86/kernel/cpu/built-in.o
> >> CC arch/x86/kernel/reboot.o
> >> CC arch/x86/kernel/cpuid.o
> >> CC arch/x86/kernel/early-quirks.o
> >> CC arch/x86/kernel/smp.o
> >> CC arch/x86/kernel/smpboot.o
> >> CC arch/x86/kernel/tsc_sync.o
> >> CC arch/x86/kernel/setup_percpu.o
> >> CC arch/x86/kernel/module.o
> >> CC arch/x86/kernel/hpet.o
> >> CC arch/x86/kernel/pcspeaker.o
> >> CC arch/x86/kernel/microcode_core.o
> >> CC arch/x86/kernel/microcode_intel.o
> >> LD arch/x86/kernel/microcode.o
> >> CC arch/x86/kernel/check.o
> >> CC arch/x86/kernel/pci-swiotlb.o
> >> CC arch/x86/kernel/mmconf-fam10h_64.o
> >> CC arch/x86/kernel/vsmp_64.o
> >> LD arch/x86/kernel/built-in.o
> >> AS arch/x86/kernel/head_64.o
> >> CC arch/x86/kernel/head64.o
> >> CC arch/x86/kernel/head.o
> >> CC arch/x86/kernel/init_task.o
> >> LDS arch/x86/kernel/vmlinux.lds
> >> CC [M] arch/x86/kernel/msr.o
> >> CC arch/x86/kvm/vmx.o
> >> CC arch/x86/kvm/../../../virt/kvm/kvm_main.o
> >> CC arch/x86/kvm/../../../virt/kvm/ioapic.o
> >> CC arch/x86/kvm/../../../virt/kvm/coalesced_mmio.o
> >> CC arch/x86/kvm/../../../virt/kvm/irq_comm.o
> >> CC arch/x86/kvm/../../../virt/kvm/eventfd.o
> >> CC arch/x86/kvm/../../../virt/kvm/assigned-dev.o
> >> CC arch/x86/kvm/../../../virt/kvm/iommu.o
> >> CC arch/x86/kvm/../../../virt/kvm/async_pf.o
> >> CC arch/x86/kvm/x86.o
> >> CC arch/x86/kvm/mmu.o
> >> CC arch/x86/kvm/emulate.o
> >> arch/x86/kvm/emulate.c: In function ???x86_emulate_insn???:
> >> arch/x86/kvm/emulate.c:2054:9: warning: ???ss_sel??? may be used uninitialized
in this function [-Wuninitialized]
> >> arch/x86/kvm/emulate.c:2020:14: note: ???ss_sel??? was declared here
> >> arch/x86/kvm/emulate.c:2053:9: warning: ???cs_sel??? may be used uninitialized
in this function [-Wuninitialized]
> >> arch/x86/kvm/emulate.c:2020:6: note: ???cs_sel??? was declared here
> >> CC arch/x86/kvm/i8259.o
> >> CC arch/x86/kvm/irq.o
> >> CC arch/x86/kvm/lapic.o
> >> CC arch/x86/kvm/i8254.o
> >> CC arch/x86/kvm/timer.o
> >> LD arch/x86/kvm/kvm.o
> >> LD arch/x86/kvm/kvm-intel.o
> >> LD arch/x86/kvm/built-in.o
> >> CC arch/x86/mm/init.o
> >> In file included from include/linux/vs_memory.h:9:0,
> >> from include/asm-generic/tlb.h:19,
> >> from /usr/local/src/linux-3.0/arch/x86/include/asm/tlb.h:9,
> >> from arch/x86/mm/init.c:16:
> >> include/linux/vserver/limit_int.h: In function ???__vx_acc_cres???:
> >> include/linux/vserver/limit_int.h:16:1: error: ???vs_debug_cres??? undeclared (first
use in this function)
> >> include/linux/vserver/limit_int.h:16:1: note: each undeclared identifier is reported
only once for each function it appears in
> >> include/linux/vserver/limit_int.h: In function ???__vx_add_cres???:
> >> include/linux/vserver/limit_int.h:33:1: error: ???vs_debug_cres??? undeclared (first
use in this function)
> >> include/linux/vserver/limit_int.h: In function ???__vx_cres_avail???:
> >> include/linux/vserver/limit_int.h:84:1: error: ???vs_debug_limit??? undeclared
(first use in this function)
> >> make[2]: *** [arch/x86/mm/init.o] Fehler 1
> >> make[1]: *** [arch/x86/mm] Fehler 2
> >> make: *** [arch/x86] Fehler 2
>
make KBUILD_SRC=
CHK include/linux/version.h
CHK include/generated/utsrelease.h
HOSTCC scripts/basic/fixdep
CC kernel/bounds.s
GEN include/generated/bounds.h
CC arch/x86/kernel/asm-offsets.s
GEN include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
HOSTCC scripts/genksyms/genksyms.o
HOSTCC scripts/genksyms/lex.lex.o
HOSTCC scripts/genksyms/parse.tab.o
HOSTLD scripts/genksyms/genksyms
CC scripts/mod/empty.o
HOSTCC scripts/mod/mk_elfconfig
MKELF scripts/mod/elfconfig.h
HOSTCC scripts/mod/file2alias.o
HOSTCC scripts/mod/modpost.o
HOSTCC scripts/mod/sumversion.o
HOSTLD scripts/mod/modpost
HOSTCC scripts/selinux/genheaders/genheaders
HOSTCC scripts/selinux/mdp/mdp
HOSTCC scripts/kallsyms
HOSTCC scripts/conmakehash
CC init/main.o
CHK include/generated/compile.h
CC init/version.o
CC init/do_mounts.o
CC init/do_mounts_initrd.o
LD init/mounts.o
CC init/initramfs.o
CC init/calibrate.o
LD init/built-in.o
HOSTCC usr/gen_init_cpio
GEN usr/initramfs_data.cpio
AS usr/initramfs_data.o
LD usr/built-in.o
LD arch/x86/crypto/built-in.o
AS [M] arch/x86/crypto/aes-x86_64-asm_64.o
CC [M] arch/x86/crypto/aes_glue.o
AS [M] arch/x86/crypto/aesni-intel_asm.o
CC [M] arch/x86/crypto/aesni-intel_glue.o
CC [M] arch/x86/crypto/fpu.o
AS [M] arch/x86/crypto/ghash-clmulni-intel_asm.o
CC [M] arch/x86/crypto/ghash-clmulni-intel_glue.o
AS [M] arch/x86/crypto/salsa20-x86_64-asm_64.o
CC [M] arch/x86/crypto/salsa20_glue.o
AS [M] arch/x86/crypto/twofish-x86_64-asm_64.o
CC [M] arch/x86/crypto/twofish_glue.o
LD [M] arch/x86/crypto/aes-x86_64.o
LD [M] arch/x86/crypto/twofish-x86_64.o
LD [M] arch/x86/crypto/salsa20-x86_64.o
LD [M] arch/x86/crypto/aesni-intel.o
LD [M] arch/x86/crypto/ghash-clmulni-intel.o
CC [M] arch/x86/crypto/crc32c-intel.o
AS arch/x86/ia32/ia32entry.o
CC arch/x86/ia32/sys_ia32.o
CC arch/x86/ia32/ia32_signal.o
CC arch/x86/ia32/ipc32.o
CC arch/x86/ia32/ia32_aout.o
CC arch/x86/ia32/audit.o
LD arch/x86/ia32/built-in.o
CC arch/x86/kernel/process_64.o
CC arch/x86/kernel/signal.o
AS arch/x86/kernel/entry_64.o
CC arch/x86/kernel/traps.o
CC arch/x86/kernel/irq.o
CC arch/x86/kernel/irq_64.o
CC arch/x86/kernel/dumpstack_64.o
CC arch/x86/kernel/time.o
CC arch/x86/kernel/ioport.o
CC arch/x86/kernel/ldt.o
CC arch/x86/kernel/dumpstack.o
CC arch/x86/kernel/setup.o
CC arch/x86/kernel/x86_init.o
CC arch/x86/kernel/i8259.o
CC arch/x86/kernel/irqinit.o
CC arch/x86/kernel/jump_label.o
CC arch/x86/kernel/irq_work.o
CC arch/x86/kernel/probe_roms.o
CC arch/x86/kernel/sys_x86_64.o
CC arch/x86/kernel/x8664_ksyms_64.o
CC arch/x86/kernel/syscall_64.o
CC arch/x86/kernel/vsyscall_64.o
AS arch/x86/kernel/vsyscall_emu_64.o
CC arch/x86/kernel/bootflag.o
CC arch/x86/kernel/e820.o
CC arch/x86/kernel/pci-dma.o
CC arch/x86/kernel/quirks.o
CC arch/x86/kernel/topology.o
CC arch/x86/kernel/kdebugfs.o
CC arch/x86/kernel/alternative.o
CC arch/x86/kernel/i8253.o
CC arch/x86/kernel/pci-nommu.o
CC arch/x86/kernel/hw_breakpoint.o
CC arch/x86/kernel/tsc.o
CC arch/x86/kernel/io_delay.o
CC arch/x86/kernel/rtc.o
CC arch/x86/kernel/pci-iommu_table.o
CC arch/x86/kernel/resource.o
CC arch/x86/kernel/trampoline.o
AS arch/x86/kernel/trampoline_64.o
CC arch/x86/kernel/process.o
CC arch/x86/kernel/i387.o
CC arch/x86/kernel/xsave.o
CC arch/x86/kernel/ptrace.o
CC arch/x86/kernel/tls.o
CC arch/x86/kernel/step.o
CC arch/x86/kernel/i8237.o
CC arch/x86/kernel/stacktrace.o
CC arch/x86/kernel/acpi/boot.o
CC arch/x86/kernel/acpi/sleep.o
LDS arch/x86/kernel/acpi/realmode/wakeup.lds
AS arch/x86/kernel/acpi/realmode/wakeup.o
CC arch/x86/kernel/acpi/realmode/wakemain.o
CC arch/x86/kernel/acpi/realmode/video-mode.o
AS arch/x86/kernel/acpi/realmode/copy.o
AS arch/x86/kernel/acpi/realmode/bioscall.o
CC arch/x86/kernel/acpi/realmode/regs.o
CC arch/x86/kernel/acpi/realmode/video-vga.o
CC arch/x86/kernel/acpi/realmode/video-vesa.o
CC arch/x86/kernel/acpi/realmode/video-bios.o
LD arch/x86/kernel/acpi/realmode/wakeup.elf
OBJCOPY arch/x86/kernel/acpi/realmode/wakeup.bin
AS arch/x86/kernel/acpi/wakeup_rm.o
AS arch/x86/kernel/acpi/wakeup_64.o
CC arch/x86/kernel/acpi/cstate.o
LD arch/x86/kernel/acpi/built-in.o
CC arch/x86/kernel/apic/apic.o
CC arch/x86/kernel/apic/apic_noop.o
CC arch/x86/kernel/apic/ipi.o
CC arch/x86/kernel/apic/hw_nmi.o
CC arch/x86/kernel/apic/io_apic.o
CC arch/x86/kernel/apic/apic_flat_64.o
CC arch/x86/kernel/apic/probe_64.o
LD arch/x86/kernel/apic/built-in.o
CC arch/x86/kernel/cpu/intel_cacheinfo.o
CC arch/x86/kernel/cpu/scattered.o
CC arch/x86/kernel/cpu/topology.o
CC arch/x86/kernel/cpu/proc.o
MKCAP arch/x86/kernel/cpu/capflags.c
CC arch/x86/kernel/cpu/capflags.o
CC arch/x86/kernel/cpu/powerflags.o
CC arch/x86/kernel/cpu/common.o
CC arch/x86/kernel/cpu/vmware.o
CC arch/x86/kernel/cpu/hypervisor.o
CC arch/x86/kernel/cpu/sched.o
CC arch/x86/kernel/cpu/mshyperv.o
CC arch/x86/kernel/cpu/bugs_64.o
CC arch/x86/kernel/cpu/intel.o
CC arch/x86/kernel/cpu/amd.o
CC arch/x86/kernel/cpu/centaur.o
CC arch/x86/kernel/cpu/perf_event.o
CC arch/x86/kernel/cpu/mcheck/mce.o
CC arch/x86/kernel/cpu/mcheck/mce-severity.o
CC arch/x86/kernel/cpu/mcheck/mce_amd.o
CC arch/x86/kernel/cpu/mcheck/threshold.o
CC arch/x86/kernel/cpu/mcheck/mce-apei.o
LD arch/x86/kernel/cpu/mcheck/built-in.o
CC arch/x86/kernel/cpu/mtrr/main.o
CC arch/x86/kernel/cpu/mtrr/if.o
CC arch/x86/kernel/cpu/mtrr/generic.o
CC arch/x86/kernel/cpu/mtrr/cleanup.o
LD arch/x86/kernel/cpu/mtrr/built-in.o
CC arch/x86/kernel/cpu/perfctr-watchdog.o
LD arch/x86/kernel/cpu/built-in.o
CC arch/x86/kernel/reboot.o
CC arch/x86/kernel/early-quirks.o
CC arch/x86/kernel/smp.o
CC arch/x86/kernel/smpboot.o
CC arch/x86/kernel/tsc_sync.o
CC arch/x86/kernel/setup_percpu.o
CC arch/x86/kernel/machine_kexec_64.o
AS arch/x86/kernel/relocate_kernel_64.o
CC arch/x86/kernel/crash.o
CC arch/x86/kernel/kprobes.o
CC arch/x86/kernel/module.o
CC arch/x86/kernel/early_printk.o
CC arch/x86/kernel/hpet.o
CC arch/x86/kernel/amd_nb.o
CC arch/x86/kernel/pcspeaker.o
CC arch/x86/kernel/pci-swiotlb.o
CC arch/x86/kernel/audit_64.o
CC arch/x86/kernel/amd_gart_64.o
CC arch/x86/kernel/aperture_64.o
CC arch/x86/kernel/mmconf-fam10h_64.o
CC arch/x86/kernel/vsmp_64.o
LD arch/x86/kernel/built-in.o
AS arch/x86/kernel/head_64.o
CC arch/x86/kernel/head64.o
CC arch/x86/kernel/head.o
CC arch/x86/kernel/init_task.o
LDS arch/x86/kernel/vmlinux.lds
CC [M] arch/x86/kernel/msr.o
CC [M] arch/x86/kernel/cpuid.o
CC [M] arch/x86/kernel/microcode_core.o
CC [M] arch/x86/kernel/microcode_amd.o
LD [M] arch/x86/kernel/microcode.o
LD arch/x86/kvm/built-in.o
CC [M] arch/x86/kvm/svm.o
CC [M] arch/x86/kvm/vmx.o
CC [M] arch/x86/kvm/../../../virt/kvm/kvm_main.o
CC [M] arch/x86/kvm/../../../virt/kvm/ioapic.o
CC [M] arch/x86/kvm/../../../virt/kvm/coalesced_mmio.o
CC [M] arch/x86/kvm/../../../virt/kvm/irq_comm.o
CC [M] arch/x86/kvm/../../../virt/kvm/eventfd.o
CC [M] arch/x86/kvm/../../../virt/kvm/assigned-dev.o
CC [M] arch/x86/kvm/../../../virt/kvm/iommu.o
CC [M] arch/x86/kvm/../../../virt/kvm/async_pf.o
CC [M] arch/x86/kvm/x86.o
CC [M] arch/x86/kvm/mmu.o
CC [M] arch/x86/kvm/emulate.o
CC [M] arch/x86/kvm/i8259.o
CC [M] arch/x86/kvm/irq.o
CC [M] arch/x86/kvm/lapic.o
CC [M] arch/x86/kvm/i8254.o
CC [M] arch/x86/kvm/timer.o
LD [M] arch/x86/kvm/kvm.o
LD [M] arch/x86/kvm/kvm-intel.o
LD [M] arch/x86/kvm/kvm-amd.o
CC arch/x86/mm/init.o
In file included from include/linux/vs_memory.h:10,
from include/asm-generic/tlb.h:20,
from /usr/src/linux-3.1.1-vs2.3.2.1/arch/x86/include/asm/tlb.h:10,
from arch/x86/mm/init.c:17:
include/linux/vserver/limit_int.h: In function '__vx_acc_cres':
include/linux/vserver/limit_int.h:16: error: 'vs_debug_cres' undeclared (first use in
this function)
include/linux/vserver/limit_int.h:16: error: (Each undeclared identifier is reported
only once
include/linux/vserver/limit_int.h:16: error: for each function it appears in.)
include/linux/vserver/limit_int.h: In function '__vx_add_cres':
include/linux/vserver/limit_int.h:33: error: 'vs_debug_cres' undeclared (first use in
this function)
include/linux/vserver/limit_int.h: In function '__vx_cres_avail':
include/linux/vserver/limit_int.h:84: error: 'vs_debug_limit' undeclared (first use
in this function)
make[4]: *** [arch/x86/mm/init.o] Error 1
make[3]: *** [arch/x86/mm] Error 2
make[2]: *** [arch/x86] Error 2
make[1]: *** [deb-pkg] Error 2
make: *** [deb-pkg] Error 2
--- linux-3.1.1-vs2.3.2.1/include/linux/vserver/debug.h.orig 2011-11-18 03:12:33.000000000
+0000
+++ linux-3.1.1-vs2.3.2.1/include/linux/vserver/debug.h 2011-11-18 03:31:20.000000000
+0000
@@ -80,7 +80,6 @@ void dump_vx_info_inactive(int);
#else /* CONFIG_VSERVER_DEBUG */
-/*
#define vs_debug_switch 0
#define vs_debug_xid 0
#define vs_debug_nid 0
@@ -90,7 +89,6 @@ void dump_vx_info_inactive(int);
#define vs_debug_cres 0
#define vs_debug_dlim 0
#define vs_debug_cvirt 0
-*/
#define vxdprintk(x...) do { } while (0)
#define vxlprintk(x...) do { } while (0)
--- linux-3.0.9-vs2.3.2.1/Makefile.orig 2011-11-17 21:59:58.000000000 -0600
+++ linux-3.0.9-vs2.3.2.1/Makefile 2011-11-17 23:18:34.000000000 -0600
@@ -1,6 +1,6 @@
VERSION = 3
PATCHLEVEL = 0
-SUBLEVEL = 7
+SUBLEVEL = 9
EXTRAVERSION = -vs2.3.2.1
NAME = Sneaky Weasel