]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
projects / mirror_ubuntu-jammy-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bad7600 12d1611)
Merge branch 'core/signal' into perfcounters/core
authorThomas Gleixner <tglx@linutronix.de>
Thu, 30 Apr 2009 19:12:13 +0000 (21:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 30 Apr 2009 19:16:49 +0000 (21:16 +0200)
commit3c56999eec7acc105a31b4546c94aad2fb844b13
tree293aef41f1441875323541cbc4f790c291b83679tree
parentbad760089c1ef7fe525c0f268a4078b9cb483903commit | diff
parent12d161147f828192b5bcc33166f468a827832767commit | diff
Merge branch 'core/signal' into perfcounters/core

This is necessary to avoid the conflict of syscall numbers.

Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h

Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/ia32/ia32entry.S diff1 | diff2 | blob | history
arch/x86/include/asm/unistd_32.h diff1 | diff2 | blob | history
arch/x86/include/asm/unistd_64.h diff1 | diff2 | blob | history
arch/x86/kernel/syscall_table_32.S diff1 | diff2 | blob | history
Ubuntu Jammy Linux kernel mirror