rpms/kernel/devel patch-2.6.26-git15.bz2.sign, NONE, 1.1 .cvsignore, 1.879, 1.880 config-generic, 1.144, 1.145 config-x86-generic, 1.46, 1.47 kernel.spec, 1.807, 1.808 linux-2.6-powerpc-tracehook.patch, 1.2, 1.3 linux-2.6-utrace.patch, 1.84, 1.85 linux-2.6-x86-tracehook.patch, 1.2, 1.3 sources, 1.840, 1.841 upstream, 1.757, 1.758 linux-2.6-sparc64-tracehook.patch, 1.2, NONE linux-2.6-tracehook.patch, 1.6, NONE patch-2.6.26-git14.bz2.sign, 1.1, NONE
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Sun Jul 27 07:22:45 UTC 2008
Author: roland
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5433
Modified Files:
.cvsignore config-generic config-x86-generic kernel.spec
linux-2.6-powerpc-tracehook.patch linux-2.6-utrace.patch
linux-2.6-x86-tracehook.patch sources upstream
Added Files:
patch-2.6.26-git15.bz2.sign
Removed Files:
linux-2.6-sparc64-tracehook.patch linux-2.6-tracehook.patch
patch-2.6.26-git14.bz2.sign
Log Message:
* Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
- 2.6.26-git15
--- NEW FILE patch-2.6.26-git15.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBIjB2OyGugalF9Dw4RAreNAJ9ywsE+bk7qOam0Y6BZsKwI1fa6lQCghEdz
JTHjfUzeU/IMZqMXcTLp8UQ=
=xpEl
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- .cvsignore 26 Jul 2008 11:05:15 -0000 1.879
+++ .cvsignore 27 Jul 2008 07:22:15 -0000 1.880
@@ -4,4 +4,4 @@
temp-*
kernel-2.6.26
linux-2.6.26.tar.bz2
-patch-2.6.26-git14.bz2
+patch-2.6.26-git15.bz2
Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- config-generic 26 Jul 2008 15:47:24 -0000 1.144
+++ config-generic 27 Jul 2008 07:22:15 -0000 1.145
@@ -2977,6 +2977,7 @@
# CONFIG_UFS_DEBUG is not set
CONFIG_9P_FS=m
CONFIG_FUSE_FS=m
+CONFIG_OMFS_FS=m
#
# Network File Systems
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- config-x86-generic 26 Jul 2008 03:47:28 -0000 1.46
+++ config-x86-generic 27 Jul 2008 07:22:15 -0000 1.47
@@ -15,6 +15,7 @@
# CONFIG_X86_SUMMIT is not set
# CONFIG_X86_BIGSMP is not set
# CONFIG_X86_VISWS is not set
+# CONFIG_X86_RDC321X is not set
# CONFIG_X86_ES7000 is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
@@ -323,6 +324,7 @@
CONFIG_PHYSICAL_ALIGN=0x400000
CONFIG_PHYSICAL_START=0x400000
CONFIG_CRASH_DUMP=y
+# CONFIG_KEXEC_JUMP is not set
CONFIG_PROC_VMCORE=y
CONFIG_CRYPTO_DEV_GEODE=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- kernel.spec 26 Jul 2008 15:47:24 -0000 1.807
+++ kernel.spec 27 Jul 2008 07:22:15 -0000 1.808
@@ -45,7 +45,7 @@
# The rc snapshot level
%define rcrev 0
# The git snapshot level
-%define gitrev 14
+%define gitrev 15
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -536,11 +536,9 @@
Patch10: linux-2.6-hotfixes.patch
-Patch20: linux-2.6-tracehook.patch
Patch21: linux-2.6-utrace.patch
Patch22: linux-2.6-x86-tracehook.patch
Patch23: linux-2.6-powerpc-tracehook.patch
-Patch24: linux-2.6-sparc64-tracehook.patch
Patch41: linux-2.6-sysrq-c.patch
Patch42: linux-2.6-x86-tune-generic.patch
@@ -959,11 +957,9 @@
ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
-ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
ApplyPatch linux-2.6-x86-tracehook.patch
ApplyPatch linux-2.6-powerpc-tracehook.patch
-ApplyPatch linux-2.6-sparc64-tracehook.patch
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
@@ -1696,6 +1692,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Sun Jul 27 2008 Roland McGrath <roland at redhat.com>
+- 2.6.26-git15
+
* Sat Jul 26 2008 Dave Jones <davej at redhat.com>
- Enable CONFIG_VIDEO_ADV_DEBUG
linux-2.6-powerpc-tracehook.patch:
Index: linux-2.6-powerpc-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-tracehook.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-powerpc-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2
+++ linux-2.6-powerpc-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3
@@ -1,13 +1,13 @@
arch/powerpc/Kconfig | 1 +
arch/powerpc/kernel/entry_32.S | 11 ++++-
arch/powerpc/kernel/entry_64.S | 10 +++-
- arch/powerpc/kernel/ptrace.c | 66 +++++++++++++++++-----------
+ arch/powerpc/kernel/ptrace.c | 47 ++++++++++-----------
arch/powerpc/kernel/signal.c | 21 ++++++++-
- include/asm-powerpc/ptrace.h | 5 ++
+ include/asm-powerpc/ptrace.h | 1 +
include/asm-powerpc/signal.h | 3 +-
include/asm-powerpc/syscall.h | 84 +++++++++++++++++++++++++++++++++++++
include/asm-powerpc/thread_info.h | 5 ++-
- 9 files changed, 169 insertions(+), 37 deletions(-)
+ 9 files changed, 147 insertions(+), 36 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index fe88418..587da5e 100644
@@ -79,7 +79,7 @@
b .ret_from_except
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index a5d0e78..9171316 100644
+index a5d0e78..3f9a942 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -22,6 +22,7 @@
@@ -90,46 +90,7 @@
#include <linux/elf.h>
#include <linux/user.h>
#include <linux/security.h>
-@@ -706,12 +707,29 @@ void user_enable_single_step(struct task
- task->thread.dbcr0 |= DBCR0_IDM | DBCR0_IC;
- regs->msr |= MSR_DE;
- #else
-+ regs->msr &= ~MSR_BE;
- regs->msr |= MSR_SE;
- #endif
- }
- set_tsk_thread_flag(task, TIF_SINGLESTEP);
- }
-
-+void user_enable_block_step(struct task_struct *task)
-+{
-+ struct pt_regs *regs = task->thread.regs;
-+
-+ if (regs != NULL) {
-+#if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
-+ task->thread.dbcr0 = DBCR0_IDM | DBCR0_BT;
-+ regs->msr |= MSR_DE;
-+#else
-+ regs->msr &= ~MSR_SE;
-+ regs->msr |= MSR_BE;
-+#endif
-+ }
-+ set_tsk_thread_flag(task, TIF_SINGLESTEP);
-+}
-+
- void user_disable_single_step(struct task_struct *task)
- {
- struct pt_regs *regs = task->thread.regs;
-@@ -728,7 +746,7 @@ void user_disable_single_step(struct tas
- task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_IDM);
- regs->msr &= ~MSR_DE;
- #else
-- regs->msr &= ~MSR_SE;
-+ regs->msr &= ~(MSR_SE | MSR_BE);
- #endif
- }
- clear_tsk_thread_flag(task, TIF_SINGLESTEP);
-@@ -1013,31 +1031,24 @@ long arch_ptrace(struct task_struct *chi
+@@ -1013,31 +1014,24 @@ long arch_ptrace(struct task_struct *chi
return ret;
}
@@ -175,7 +136,7 @@
if (unlikely(current->audit_context)) {
#ifdef CONFIG_PPC64
-@@ -1055,16 +1066,19 @@ void do_syscall_trace_enter(struct pt_re
+@@ -1055,16 +1049,19 @@ void do_syscall_trace_enter(struct pt_re
regs->gpr[5] & 0xffffffff,
regs->gpr[6] & 0xffffffff);
}
@@ -251,7 +212,7 @@
unsigned long r5, unsigned long r6, unsigned long r7,
unsigned long r8, struct pt_regs *regs)
diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h
-index 3d6e310..42301cf 100644
+index 3d6e310..734e075 100644
--- a/include/asm-powerpc/ptrace.h
+++ b/include/asm-powerpc/ptrace.h
@@ -84,6 +84,7 @@ struct pt_regs {
@@ -262,23 +223,6 @@
#define regs_return_value(regs) ((regs)->gpr[3])
#ifdef CONFIG_SMP
-@@ -136,7 +137,9 @@ do { \
- * These are defined as per linux/ptrace.h, which see.
- */
- #define arch_has_single_step() (1)
-+#define arch_has_block_step() (1)
- extern void user_enable_single_step(struct task_struct *);
-+extern void user_enable_block_step(struct task_struct *);
- extern void user_disable_single_step(struct task_struct *);
-
- #endif /* __ASSEMBLY__ */
-@@ -289,4 +292,6 @@ extern void user_disable_single_step(str
- #define PPC_PTRACE_PEEKUSR_3264 0x91
- #define PPC_PTRACE_POKEUSR_3264 0x90
-
-+#define PTRACE_SINGLEBLOCK 0x100 /* resume execution until next branch */
-+
- #endif /* _ASM_POWERPC_PTRACE_H */
diff --git a/include/asm-powerpc/signal.h b/include/asm-powerpc/signal.h
index a8c7bab..a7360cd 100644
--- a/include/asm-powerpc/signal.h
linux-2.6-utrace.patch:
Index: linux-2.6-utrace.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-utrace.patch,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- linux-2.6-utrace.patch 26 Jul 2008 03:47:28 -0000 1.84
+++ linux-2.6-utrace.patch 27 Jul 2008 07:22:15 -0000 1.85
@@ -567,10 +567,10 @@
* ptrace_init_task - initialize ptrace state for a new child
* @child: new child task
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 99036d5..3f56a3f 100644
+index f59318a..514f217 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -1199,6 +1199,11 @@ struct task_struct {
+@@ -1198,6 +1198,11 @@ struct task_struct {
#endif
seccomp_t seccomp;
@@ -582,7 +582,7 @@
/* Thread group tracking */
u32 parent_exec_id;
u32 self_exec_id;
-@@ -1798,6 +1803,7 @@ extern int kill_pgrp(struct pid *pid, in
+@@ -1797,6 +1802,7 @@ extern int kill_pgrp(struct pid *pid, in
extern int kill_pid(struct pid *pid, int sig, int priv);
extern int kill_proc_info(int, struct siginfo *, pid_t);
extern int do_notify_parent(struct task_struct *, int);
linux-2.6-x86-tracehook.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-x86-tracehook.patch
Index: linux-2.6-x86-tracehook.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86-tracehook.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-x86-tracehook.patch 26 Jul 2008 03:47:28 -0000 1.2
+++ linux-2.6-x86-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3
@@ -1,17 +1,1130 @@
- arch/x86/Kconfig | 1 +
- arch/x86/kernel/ptrace.c | 34 +------
- arch/x86/kernel/signal_32.c | 11 ++-
- arch/x86/kernel/signal_64.c | 49 +++-------
- include/asm-x86/ptrace.h | 5 +
- include/asm-x86/syscall.h | 210 +++++++++++++++++++++++++++++++++++++++++
- include/asm-x86/thread_info.h | 4 +-
- 7 files changed, 248 insertions(+), 66 deletions(-)
+ Documentation/isdn/README.mISDN | 6 -
+ arch/alpha/kernel/osf_sys.c | 10 +-
+ arch/arm/mach-at91/at91cap9_devices.c | 8 +-
+ arch/arm/mach-at91/at91rm9200_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 12 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 12 +-
+ arch/arm/mach-at91/board-cam60.c | 2 +-
+ arch/arm/mach-at91/board-cap9adk.c | 2 +-
+ arch/arm/mach-at91/board-dk.c | 2 +-
+ arch/arm/mach-at91/board-kb9202.c | 2 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 2 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 2 +-
+ arch/arm/mach-at91/board-yl-9200.c | 2 +-
+ arch/avr32/boards/atstk1000/Kconfig | 4 -
+ arch/avr32/boards/atstk1000/Makefile | 1 -
+ arch/avr32/boards/atstk1000/atstk1002.c | 78 +-
+ arch/avr32/mach-at32ap/at32ap700x.c | 52 -
+ arch/avr32/mach-at32ap/hsmc.c | 2 +-
+ arch/parisc/hpux/sys_hpux.c | 10 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/kernel/ptrace.c | 34 +-
+ arch/x86/kernel/signal_32.c | 11 +-
+ arch/x86/kernel/signal_64.c | 49 +-
+ drivers/char/ser_a2232.c | 52 +-
+ drivers/char/vme_scc.c | 59 +-
+ drivers/firmware/memmap.c | 6 +-
+ drivers/infiniband/core/ucm.c | 10 +-
+ drivers/infiniband/core/ucma.c | 11 +-
+ drivers/infiniband/hw/mlx4/cq.c | 1 -
+ drivers/infiniband/hw/mlx4/main.c | 1 -
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 -
+ drivers/infiniband/hw/mlx4/mr.c | 1 -
+ drivers/infiniband/hw/mlx4/qp.c | 1 -
+ drivers/infiniband/hw/mlx4/srq.c | 1 -
+ drivers/infiniband/hw/mlx4/user.h | 1 -
+ drivers/infiniband/hw/nes/nes.c | 4 +-
+ drivers/infiniband/hw/nes/nes_cm.c | 2034 +++++-------
+ drivers/infiniband/hw/nes/nes_cm.h | 23 +-
+ drivers/infiniband/hw/nes/nes_hw.c | 9 +
+ drivers/infiniband/hw/nes/nes_verbs.c | 15 +
+ drivers/infiniband/ulp/ipoib/Kconfig | 22 +-
+ drivers/isdn/Kconfig | 4 +-
+ drivers/isdn/Makefile | 1 -
+ drivers/isdn/hardware/Makefile | 1 -
+ drivers/isdn/hardware/mISDN/Kconfig | 25 -
+ drivers/isdn/hardware/mISDN/Makefile | 7 -
+ drivers/isdn/hardware/mISDN/hfc_multi.h | 1204 -------
+ drivers/isdn/hardware/mISDN/hfc_pci.h | 228 --
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 5320 ------------------------------
+ drivers/isdn/hardware/mISDN/hfcpci.c | 2256 -------------
+ drivers/isdn/mISDN/Kconfig | 44 -
+ drivers/isdn/mISDN/Makefile | 13 -
+ drivers/isdn/mISDN/core.c | 244 --
+ drivers/isdn/mISDN/core.h | 77 -
+ drivers/isdn/mISDN/dsp.h | 263 --
+ drivers/isdn/mISDN/dsp_audio.c | 434 ---
+ drivers/isdn/mISDN/dsp_biquad.h | 65 -
+ drivers/isdn/mISDN/dsp_blowfish.c | 672 ----
+ drivers/isdn/mISDN/dsp_cmx.c | 1886 -----------
+ drivers/isdn/mISDN/dsp_core.c | 1191 -------
+ drivers/isdn/mISDN/dsp_dtmf.c | 303 --
+ drivers/isdn/mISDN/dsp_ecdis.h | 110 -
+ drivers/isdn/mISDN/dsp_hwec.c | 138 -
+ drivers/isdn/mISDN/dsp_hwec.h | 10 -
+ drivers/isdn/mISDN/dsp_pipeline.c | 348 --
+ drivers/isdn/mISDN/dsp_tones.c | 551 ---
+ drivers/isdn/mISDN/fsm.c | 183 -
+ drivers/isdn/mISDN/fsm.h | 67 -
+ drivers/isdn/mISDN/hwchannel.c | 365 --
+ drivers/isdn/mISDN/l1oip.h | 91 -
+ drivers/isdn/mISDN/l1oip_codec.c | 374 ---
+ drivers/isdn/mISDN/l1oip_core.c | 1518 ---------
+ drivers/isdn/mISDN/layer1.c | 403 ---
+ drivers/isdn/mISDN/layer1.h | 26 -
+ drivers/isdn/mISDN/layer2.c | 2216 -------------
+ drivers/isdn/mISDN/layer2.h | 140 -
+ drivers/isdn/mISDN/socket.c | 781 -----
+ drivers/isdn/mISDN/stack.c | 674 ----
+ drivers/isdn/mISDN/tei.c | 1340 --------
+ drivers/isdn/mISDN/timerdev.c | 301 --
+ drivers/mmc/core/Makefile | 1 -
+ drivers/mmc/core/bus.c | 8 -
+ drivers/mmc/core/core.h | 7 -
+ drivers/mmc/core/debugfs.c | 225 --
+ drivers/mmc/core/host.c | 8 -
+ drivers/mmc/host/atmel-mci-regs.h | 2 -
+ drivers/mmc/host/atmel-mci.c | 189 --
+ drivers/mmc/host/imxmmc.c | 50 +-
+ drivers/mmc/host/mmc_spi.c | 3 +-
+ drivers/mtd/Kconfig | 2 +
+ drivers/mtd/afs.c | 2 +
+ drivers/mtd/chips/cfi_cmdset_0001.c | 17 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 3 +
+ drivers/mtd/chips/cfi_cmdset_0020.c | 2 +
+ drivers/mtd/chips/cfi_probe.c | 1 +
+ drivers/mtd/chips/cfi_util.c | 3 +
+ drivers/mtd/chips/chipreg.c | 2 +
+ drivers/mtd/chips/gen_probe.c | 5 +-
+ drivers/mtd/chips/jedec_probe.c | 133 +-
+ drivers/mtd/chips/map_absent.c | 1 +
+ drivers/mtd/chips/map_ram.c | 1 +
+ drivers/mtd/chips/map_rom.c | 1 +
+ drivers/mtd/cmdlinepart.c | 4 +-
+ drivers/mtd/devices/Kconfig | 1 +
+ drivers/mtd/devices/Makefile | 1 +
+ drivers/mtd/devices/block2mtd.c | 6 +
+ drivers/mtd/devices/doc2000.c | 2 +
+ drivers/mtd/devices/doc2001.c | 2 +
+ drivers/mtd/devices/doc2001plus.c | 2 +
+ drivers/mtd/devices/docecc.c | 2 +
+ drivers/mtd/devices/docprobe.c | 5 +
+ drivers/mtd/devices/lart.c | 2 +
+ drivers/mtd/devices/m25p80.c | 22 -
+ drivers/mtd/devices/ms02-nv.c | 2 +
+ drivers/mtd/devices/ms02-nv.h | 2 +
+ drivers/mtd/devices/mtd_dataflash.c | 135 +-
+ drivers/mtd/devices/mtdram.c | 1 +
+ drivers/mtd/devices/phram.c | 2 +
+ drivers/mtd/devices/pmc551.c | 2 +
+ drivers/mtd/devices/slram.c | 2 +
+ drivers/mtd/ftl.c | 3 +
+ drivers/mtd/inftlcore.c | 5 +
+ drivers/mtd/inftlmount.c | 4 +
+ drivers/mtd/maps/Kconfig | 30 +-
+ drivers/mtd/maps/Makefile | 3 +-
+ drivers/mtd/maps/amd76xrom.c | 1 +
+ drivers/mtd/maps/autcpu12-nvram.c | 2 +
+ drivers/mtd/maps/bast-flash.c | 226 ++
+ drivers/mtd/maps/bfin-async-flash.c | 219 --
+ drivers/mtd/maps/cdb89712.c | 1 +
+ drivers/mtd/maps/ceiva.c | 1 +
+ drivers/mtd/maps/cfi_flagadm.c | 2 +
+ drivers/mtd/maps/dbox2-flash.c | 2 +
+ drivers/mtd/maps/dc21285.c | 2 +
+ drivers/mtd/maps/dilnetpc.c | 2 +
+ drivers/mtd/maps/dmv182.c | 2 +
+ drivers/mtd/maps/ebony.c | 2 +
+ drivers/mtd/maps/edb7312.c | 2 +
+ drivers/mtd/maps/fortunet.c | 1 +
+ drivers/mtd/maps/h720x-flash.c | 2 +
+ drivers/mtd/maps/ichxrom.c | 1 +
+ drivers/mtd/maps/impa7.c | 2 +
+ drivers/mtd/maps/integrator-flash.c | 2 +
+ drivers/mtd/maps/ipaq-flash.c | 2 +
+ drivers/mtd/maps/ixp2000.c | 2 +
+ drivers/mtd/maps/ixp4xx.c | 2 +
+ drivers/mtd/maps/l440gx.c | 2 +
+ drivers/mtd/maps/map_funcs.c | 2 +
+ drivers/mtd/maps/mbx860.c | 2 +
+ drivers/mtd/maps/netsc520.c | 2 +
+ drivers/mtd/maps/nettel.c | 2 +
+ drivers/mtd/maps/octagon-5066.c | 1 +
+ drivers/mtd/maps/omap-toto-flash.c | 2 +
+ drivers/mtd/maps/pci.c | 2 +
+ drivers/mtd/maps/pcmciamtd.c | 5 +-
+ drivers/mtd/maps/physmap.c | 24 +-
+ drivers/mtd/maps/plat-ram.c | 2 +
+ drivers/mtd/maps/redwood.c | 2 +
+ drivers/mtd/maps/rpxlite.c | 2 +
+ drivers/mtd/maps/sa1100-flash.c | 2 +
+ drivers/mtd/maps/sbc8240.c | 3 +
+ drivers/mtd/maps/sbc_gxx.c | 2 +
+ drivers/mtd/maps/sc520cdp.c | 2 +
+ drivers/mtd/maps/scb2_flash.c | 1 +
+ drivers/mtd/maps/scx200_docflash.c | 2 +
+ drivers/mtd/maps/sharpsl-flash.c | 2 +
+ drivers/mtd/maps/solutionengine.c | 2 +
+ drivers/mtd/maps/sun_uflash.c | 2 +-
+ drivers/mtd/maps/tqm8xxl.c | 2 +
+ drivers/mtd/maps/ts5500_flash.c | 2 +
+ drivers/mtd/maps/tsunami_flash.c | 1 +
+ drivers/mtd/maps/uclinux.c | 2 +
+ drivers/mtd/maps/vmax301.c | 1 +
+ drivers/mtd/maps/walnut.c | 2 +
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 2 +
+ drivers/mtd/mtd_blkdevs.c | 34 +-
+ drivers/mtd/mtdblock.c | 2 +
+ drivers/mtd/mtdblock_ro.c | 2 +
[...44849 lines suppressed...]
+- long inflight_refs;
++ int total_refs;
++ int inflight_refs;
+
+ total_refs = file_count(u->sk.sk_socket->file);
+- inflight_refs = atomic_long_read(&u->inflight);
++ inflight_refs = atomic_read(&u->inflight);
+
+ BUG_ON(inflight_refs < 1);
+ BUG_ON(total_refs < inflight_refs);
+@@ -324,7 +324,7 @@ void unix_gc(void)
+ /* Move cursor to after the current position. */
+ list_move(&cursor, &u->link);
+
+- if (atomic_long_read(&u->inflight) > 0) {
++ if (atomic_read(&u->inflight) > 0) {
+ list_move_tail(&u->link, &gc_inflight_list);
+ u->gc_candidate = 0;
+ scan_children(&u->sk, inc_inflight_move_tail, NULL);
+diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
+index 96036cf..23a2cc0 100644
+--- a/net/xfrm/xfrm_algo.c
++++ b/net/xfrm/xfrm_algo.c
+@@ -718,7 +718,7 @@ int skb_icv_walk(const struct sk_buff *s
+ for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+ int end;
+
+- WARN_ON(start > offset + len);
++ BUG_TRAP(start <= offset + len);
+
+ end = start + skb_shinfo(skb)->frags[i].size;
+ if ((copy = end - offset) > 0) {
+@@ -748,7 +748,7 @@ int skb_icv_walk(const struct sk_buff *s
+ for (; list; list = list->next) {
+ int end;
+
+- WARN_ON(start > offset + len);
++ BUG_TRAP(start <= offset + len);
+
+ end = start + list->len;
+ if ((copy = end - offset) > 0) {
+diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c
+index c609a4b..800f669 100644
+--- a/net/xfrm/xfrm_ipcomp.c
++++ b/net/xfrm/xfrm_ipcomp.c
+@@ -22,6 +22,7 @@
+ #include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/percpu.h>
++#include <linux/rtnetlink.h>
+ #include <linux/smp.h>
+ #include <linux/vmalloc.h>
+ #include <net/ip.h>
+@@ -250,7 +251,7 @@ static void ipcomp_free_tfms(struct cryp
+ break;
+ }
+
+- WARN_ON(!pos);
++ BUG_TRAP(pos);
+
+ if (--pos->users)
+ return;
+diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
+index 4c6914e..72fddaf 100644
+--- a/net/xfrm/xfrm_state.c
++++ b/net/xfrm/xfrm_state.c
+@@ -538,7 +538,7 @@ EXPORT_SYMBOL(xfrm_state_alloc);
+
+ void __xfrm_state_destroy(struct xfrm_state *x)
+ {
+- WARN_ON(x->km.state != XFRM_STATE_DEAD);
++ BUG_TRAP(x->km.state == XFRM_STATE_DEAD);
+
+ spin_lock_bh(&xfrm_state_lock);
+ list_del(&x->all);
+diff --git a/security/capability.c b/security/capability.c
+index 63d10da..5b01c0b 100644
+--- a/security/capability.c
++++ b/security/capability.c
+@@ -211,7 +211,8 @@ static int cap_inode_follow_link(struct
+ return 0;
+ }
+
+-static int cap_inode_permission(struct inode *inode, int mask)
++static int cap_inode_permission(struct inode *inode, int mask,
++ struct nameidata *nd)
+ {
+ return 0;
+ }
+diff --git a/security/security.c b/security/security.c
+index ff70687..59f23b5 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -429,11 +429,11 @@ int security_inode_follow_link(struct de
+ return security_ops->inode_follow_link(dentry, nd);
+ }
+
+-int security_inode_permission(struct inode *inode, int mask)
++int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd)
+ {
+ if (unlikely(IS_PRIVATE(inode)))
+ return 0;
+- return security_ops->inode_permission(inode, mask);
++ return security_ops->inode_permission(inode, mask, nd);
+ }
+
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+@@ -442,7 +442,6 @@ int security_inode_setattr(struct dentry
+ return 0;
+ return security_ops->inode_setattr(dentry, attr);
+ }
+-EXPORT_SYMBOL_GPL(security_inode_setattr);
+
+ int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
+ {
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index 40d06c5..3481cde 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -2624,11 +2624,12 @@ static int selinux_inode_follow_link(str
+ return dentry_has_perm(current, NULL, dentry, FILE__READ);
+ }
+
+-static int selinux_inode_permission(struct inode *inode, int mask)
++static int selinux_inode_permission(struct inode *inode, int mask,
++ struct nameidata *nd)
+ {
+ int rc;
+
+- rc = secondary_ops->inode_permission(inode, mask);
++ rc = secondary_ops->inode_permission(inode, mask, nd);
+ if (rc)
+ return rc;
+
+@@ -5653,20 +5654,27 @@ static struct nf_hook_ops selinux_ipv6_o
+ static int __init selinux_nf_ip_init(void)
+ {
+ int err = 0;
++ u32 iter;
+
+ if (!selinux_enabled)
+ goto out;
+
+ printk(KERN_DEBUG "SELinux: Registering netfilter hooks\n");
+
+- err = nf_register_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops));
+- if (err)
+- panic("SELinux: nf_register_hooks for IPv4: error %d\n", err);
++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++) {
++ err = nf_register_hook(&selinux_ipv4_ops[iter]);
++ if (err)
++ panic("SELinux: nf_register_hook for IPv4: error %d\n",
++ err);
++ }
+
+ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+- err = nf_register_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops));
+- if (err)
+- panic("SELinux: nf_register_hooks for IPv6: error %d\n", err);
++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++) {
++ err = nf_register_hook(&selinux_ipv6_ops[iter]);
++ if (err)
++ panic("SELinux: nf_register_hook for IPv6: error %d\n",
++ err);
++ }
+ #endif /* IPV6 */
+
+ out:
+@@ -5678,11 +5686,15 @@ __initcall(selinux_nf_ip_init);
+ #ifdef CONFIG_SECURITY_SELINUX_DISABLE
+ static void selinux_nf_ip_exit(void)
+ {
++ u32 iter;
++
+ printk(KERN_DEBUG "SELinux: Unregistering netfilter hooks\n");
+
+- nf_unregister_hooks(selinux_ipv4_ops, ARRAY_SIZE(selinux_ipv4_ops));
++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv4_ops); iter++)
++ nf_unregister_hook(&selinux_ipv4_ops[iter]);
+ #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+- nf_unregister_hooks(selinux_ipv6_ops, ARRAY_SIZE(selinux_ipv6_ops));
++ for (iter = 0; iter < ARRAY_SIZE(selinux_ipv6_ops); iter++)
++ nf_unregister_hook(&selinux_ipv6_ops[iter]);
+ #endif /* IPV6 */
+ }
+ #endif
+diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
+index 1b40e55..ee5a51c 100644
+--- a/security/smack/smack_lsm.c
++++ b/security/smack/smack_lsm.c
+@@ -522,7 +522,8 @@ static int smack_inode_rename(struct ino
+ *
+ * Returns 0 if access is permitted, -EACCES otherwise
+ */
+-static int smack_inode_permission(struct inode *inode, int mask)
++static int smack_inode_permission(struct inode *inode, int mask,
++ struct nameidata *nd)
+ {
+ /*
+ * No permission to check. Existence test. Yup, it's there.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- sources 26 Jul 2008 11:05:15 -0000 1.840
+++ sources 27 Jul 2008 07:22:15 -0000 1.841
@@ -1,2 +1,2 @@
5169d01c405bc3f866c59338e217968c linux-2.6.26.tar.bz2
-b84837b3c4c226985ca101bb88105615 patch-2.6.26-git14.bz2
+e7e0954872d735515623e77506d65065 patch-2.6.26-git15.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.757
retrieving revision 1.758
diff -u -r1.757 -r1.758
--- upstream 26 Jul 2008 11:05:15 -0000 1.757
+++ upstream 27 Jul 2008 07:22:15 -0000 1.758
@@ -1,2 +1,2 @@
linux-2.6.26.tar.bz2
-patch-2.6.26-git14.bz2
+patch-2.6.26-git15.bz2
--- linux-2.6-sparc64-tracehook.patch DELETED ---
--- linux-2.6-tracehook.patch DELETED ---
--- patch-2.6.26-git14.bz2.sign DELETED ---
More information about the fedora-extras-commits
mailing list