rpms/kernel/devel linux-2.6-x86-tracehook.patch,1.3,1.4
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Sun Jul 27 23:43:41 UTC 2008
- Previous message (by thread): rpms/zabbix/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 zabbix.spec, 1.23, 1.24
- Next message (by thread): rpms/mousetweaks/devel icon-names.patch, NONE, 1.1 mousetweaks.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: roland
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22155
Modified Files:
linux-2.6-x86-tracehook.patch
Log Message:
replace botched patch
linux-2.6-x86-tracehook.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86-tracehook.patch 27 Jul 2008 07:22:15 -0000 1.3
+++ linux-2.6-x86-tracehook.patch 27 Jul 2008 23:43:11 -0000 1.4
@@ -1,1125 +1,12 @@
- 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 +
- drivers/mtd/mtdchar.c | 24 +-
- drivers/mtd/mtdconcat.c | 2 +
- drivers/mtd/mtdcore.c | 14 +-
- drivers/mtd/mtdpart.c | 448 ++--
- drivers/mtd/nand/Kconfig | 28 +-
- drivers/mtd/nand/Makefile | 3 +-
- drivers/mtd/nand/at91_nand.c | 594 ++++
- drivers/mtd/nand/atmel_nand.c | 650 ----
[...44836 lines suppressed...]
-+ 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.
+ /* flags to check in __switch_to() */
+ #define _TIF_WORK_CTXSW \
- Previous message (by thread): rpms/zabbix/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 zabbix.spec, 1.23, 1.24
- Next message (by thread): rpms/mousetweaks/devel icon-names.patch, NONE, 1.1 mousetweaks.spec, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list