Linux 2.6.21.7
Subsystems (11)
We (the -stable team) are announcing the release of the 2.6.21.7 kernel. All users of the 2.6.21 kernel series are encouraged to upgrade.
I'll also be replying to this message with a copy of the patch between 2.6.21.6 and 2.6.21.7
The updated 2.6.21.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.21.y.git
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.21.y.git;a=summarythanks,
greg k-h
---------
Makefile | 2 arch/i386/kernel/entry.S | 8 - arch/powerpc/kernel/signal_64.c | 10 - arch/x86_64/mm/init.c | 2 drivers/ide/pci/hpt366.c | 8 - drivers/md/dm-crypt.c | 50 ++---- drivers/md/raid1.c | 21 +- drivers/md/raid10.c | 6 drivers/media/video/bt8xx/bttv-driver.c | 13 - drivers/media/video/cx88/cx88-blackbird.c | 2 drivers/media/video/saa7134/saa7134-tvaudio.c | 2 drivers/net/bnx2.c | 25 +-- drivers/net/sky2.c | 9 + drivers/serial/mpsc.c | 3 include/linux/sched.h | 1 ipc/shm.c | 4 kernel/auditfilter.c | 2 kernel/exit.c | 22 ++ kernel/futex.c | 205 ++++++++++++++++---------- kernel/posix-timers.c | 35 ++++ kernel/rtmutex.c | 24 ++- kernel/sched.c | 22 +- kernel/time/ntp.c | 2 mm/rmap.c | 24 --- 24 files changed, 319 insertions(+), 183 deletions(-)
Summary of changes from v2.6.21.6 to v2.6.21.7
==============================================
Adam Litke (1):
hugetlb: fix get_policy for stacked shared memory files
Alexey Kuznetsov (1):
pi-futex: Fix exit races and locking problems
Bob Picco (1):
sparsemem: fix oops in x86_64 show_mem
Christoph Lameter (1):
sched: fix next_interval determination in idle_balance()
Greg Kroah-Hartman (1):
Linux 2.6.21.7
Hugh Dickins (1):
mm: kill validate_anon_vma to avoid mapcount BUG
Jason Wessel (1):
b
i386: fix infinite loop with singlestep int80 syscalls
Jay Lubomirski (1):
serial: clear proper MPSC interrupt cause bits
Jeff Mahoney (1):
saa7134: fix thread shutdown handling
Jelle Foks (1):
V4L: cx88-blackbird: fix vidioc_g_tuner never ending list of tuners
Michael Chan (1):
BNX2: Fix netdev watchdog on 5708.
Mike Accetta (1):
md: Fix bug in error handling during raid1 repair.
Milan Broz (1):
dm crypt: disable barriers
NeilBrown (1):
md: Fix two raid10 bugs.
Olaf Kirch (3):
dm crypt: fix call to clone_init
dm crypt: fix avoid cloned bio ref after free dm crypt: fix remove first_clone
Paul Mackerras (1):
POWERPC: Fix subtle FP state corruption bug in signal return on SMP
Sergei Shtylyov (1):
hpt366: disallow Ultra133 for HPT374
Stephen Hemminger (1):
sky2: workaround for lost IRQ
Thomas Gleixner (5):
rt-mutex: Fix stale return value
rt-mutex: Fix chain walk early wakeup bug
posix-timers: Prevent softirq starvation by small intervals and SIG_IGN
FUTEX: Restore the dropped ERSCH fix
NTP: remove clock_was_set() call to prevent deadlock
Tony Jones (1):
audit: fix oops removing watch if audit disabled
Trent Piepho (1):
V4L: bttv: fix v4l1 api usage breaking the driver
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 21 -EXTRAVERSION = .6 +EXTRAVERSION = .7 NAME = Nocturnal Monster Puppy # *DOCUMENTATION*
arch/i386/kernel/entry.S +4 -4
@@ -371,10 +371,6 @@ ENTRY(system_call) CFI_ADJUST_CFA_OFFSET 4 SAVE_ALL GET_THREAD_INFO(%ebp) - testl $TF_MASK,PT_EFLAGS(%esp) - jz no_singlestep - orl $_TIF_SINGLESTEP,TI_flags(%ebp) -no_singlestep: # system call tracing in operation / emulation /* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */ testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
@@ -389,6 +385,10 @@ syscall_exit: # setting need_resched or sigpending # between sampling and the iret TRACE_IRQS_OFF + testl $TF_MASK,PT_EFLAGS(%esp) # If tracing set singlestep flag on exit + jz no_singlestep + orl $_TIF_SINGLESTEP,TI_flags(%ebp) +no_singlestep: movl TI_flags(%ebp), %ecx testw $_TIF_ALLWORK_MASK, %cx # current->work jne syscall_exit_work
arch/powerpc/kernel/signal_64.c +7 -3
@@ -177,6 +177,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,*/ discard_lazy_cpu_state (); +/* +* Force reload of FP/VEC. +* This has to be done before copying stuff into current->thread.fpr/vr +* for the reasons explained in the previous comment. +*/ + regs->msr &= ~(MSR_FP |MSR_FE0 |MSR_FE1 |MSR_VEC ); + err |=__copy_from_user (¤t->thread.fpr, &sc->fp_regs,FP_REGS_SIZE );#ifdef CONFIG_ALTIVEC
@@ -198,9 +205,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, current->thread.vrsave =0 ;#endif /* CONFIG_ALTIVEC */ -/* Force reload of FP/VEC */ - regs->msr &= ~(MSR_FP |MSR_FE0 |MSR_FE1 |MSR_VEC ); -return err; }
arch/x86_64/mm/init.c +2 -0
@@ -72,6 +72,8 @@ void show_mem(void)for_each_online_pgdat (pgdat) {for (i =0 ; i < pgdat->node_spanned_pages; ++i) { +if (!pfn_valid (pgdat->node_start_pfn + i)) +continue ; page =pfn_to_page (pgdat->node_start_pfn + i); total++;if (PageReserved (page))
drivers/ide/pci/hpt366.c +4 -4
@@ -1,5 +1,5 @@/* -* linux/drivers/ide/pci/hpt366.c Version 1.03 May 4, 2007 +* linux/drivers/ide/pci/hpt366.c Version 1.04 Jun 4, 2007 * * Copyright (C) 1999-2003 Andre Hedrick <[email protected]> * Portions Copyright (C) 2001 Sun Microsystems, Inc.
@@ -106,7 +106,8 @@* switch to calculating PCI clock frequency based on the chip's base DPLL * frequency * - switch to using the DPLL clock and enable UltraATA/133 mode by default on -* anything newer than HPT370/A +* anything newer than HPT370/A (except HPT374 that is not capable of this +* mode according to the manual) * - fold PCI clock detection and DPLL setup code into init_chipset_hpt366(), * also fixing the interchanged 25/40 MHz PCI clock cases for HPT36x chips; * unify HPT36x/37x timing setup code and the speedproc handlers by joining
@@ -365,7 +366,6 @@ static u32 sixty_six_base_hpt37x[] = { };#define HPT366_DEBUG_DRIVE_INFO 0 -#define HPT374_ALLOW_ATA133_6 1#define HPT371_ALLOW_ATA133_6 1#define HPT302_ALLOW_ATA133_6 1#define HPT372_ALLOW_ATA133_6 1
@@ -450,7 +450,7 @@ static struct hpt_info hpt370a __devinitdata = {static struct hpt_info hpt374__devinitdata = { .chip_type =HPT374 , - .max_mode =HPT374_ALLOW_ATA133_6 ?4 :3 , + .max_mode =3 , .dpll_clk =48 , .settings = hpt37x_settings };
drivers/md/dm-crypt.c +18 -32
127 lines not on this page · raw message
drivers/md/raid1.c +14 -7
@@ -1240,17 +1240,24 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio) } r1_bio->read_disk = primary;for (i=0 ; i<mddev->raid_disks; i++) -if (r1_bio->bios[i]->bi_end_io == end_sync_read && -test_bit (BIO_UPTODATE , &r1_bio->bios[i]->bi_flags)) { +if (r1_bio->bios[i]->bi_end_io == end_sync_read) {int j;int vcnt = r1_bio->sectors >> (PAGE_SHIFT -9 );struct bio *pbio = r1_bio->bios[primary];struct bio *sbio = r1_bio->bios[i]; -for (j = vcnt; j-- ; ) -if (memcmp (page_address (pbio->bi_io_vec[j].bv_page), -page_address (sbio->bi_io_vec[j].bv_page), -PAGE_SIZE )) -break ; + +if (test_bit (BIO_UPTODATE , &sbio->bi_flags)) { +for (j = vcnt; j-- ; ) { +struct page *p, *s; + p = pbio->bi_io_vec[j].bv_page; + s = sbio->bi_io_vec[j].bv_page; +if (memcmp (page_address (p), +page_address (s), +PAGE_SIZE )) +break ; + } + }else + j =0 ;if (j >=0 ) mddev->resync_mismatches += r1_bio->sectors;if (j <0 ||test_bit (MD_RECOVERY_CHECK , &mddev->recovery)) {
drivers/md/raid10.c +6 -0
@@ -1867,6 +1867,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, iint d = r10_bio->devs[i].devnum; bio = r10_bio->devs[i].bio; bio->bi_end_io =NULL ; +clear_bit (BIO_UPTODATE , &bio->bi_flags);if (conf->mirrors[d].rdev ==NULL ||test_bit (Faulty, &conf->mirrors[d].rdev->flags))continue ;
@@ -2037,6 +2038,11 @@ static int run(mddev_t *mddev)/* 'size' is now the number of chunks in the array */ /* calculate "used chunks per device" in 'stride' */ stride = size * conf->copies; + +/* We need to round up when dividing by raid_disks to +* get the stride size. +*/ + stride += conf->raid_disks -1 ;sector_div (stride, conf->raid_disks); mddev->size = stride << (conf->chunk_shift-1 );
drivers/media/video/bt8xx/bttv-driver.c +6 -7
@@ -1313,7 +1313,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)/* Call with btv->lock down. */ static void -set_input (struct bttv *btv,unsigned int input) +set_input (struct bttv *btv,unsigned int input,unsigned int norm) {unsigned long flags;
@@ -1332,7 +1332,7 @@ set_input(struct bttv *btv, unsigned int input) }audio_input (btv,(input == bttv_tvcards[btv->c.type].tuner ?TVAUDIO_INPUT_TUNER :TVAUDIO_INPUT_EXTERN )); -set_tvnorm (btv,btv->tvnorm); +set_tvnorm (btv, norm);i2c_vidiocschan (btv); }
@@ -1423,7 +1423,7 @@ static void bttv_reinit_bt848(struct bttv *btv)init_bt848 (btv); btv->pll.pll_current =-1 ; -set_input (btv,btv->input); +set_input (btv, btv->input, btv->tvnorm); }static int get_control (struct bttv *btv,struct v4l2_control *c)
@@ -1993,8 +1993,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)return 0 ; } - btv->tvnorm = v->norm; -set_input (btv,v->channel); +set_input (btv, v->channel, v->norm);mutex_unlock (&btv->lock);return 0 ; }
@@ -2130,7 +2129,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)if (*i > bttv_tvcards[btv->c.type].video_inputs)return -EINVAL ;mutex_lock (&btv->lock); -set_input (btv,*i); +set_input (btv, *i, btv->tvnorm);mutex_unlock (&btv->lock);return 0 ; }
@@ -4762,7 +4761,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,bt848_hue (btv,32768 );bt848_sat (btv,32768 );audio_mute (btv,1 ); -set_input (btv,0 ); +set_input (btv,0 , btv->tvnorm);bttv_crop_reset (&btv->crop[0 ], btv->tvnorm); btv->crop[1 ] = btv->crop[0 ];/* current = default */ disclaim_vbi_lines (btv);
drivers/media/video/cx88/cx88-blackbird.c +2 -0
@@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,if (unlikely (UNSET == core->tuner_type))return -EINVAL ; +if (0 != t->index) +return -EINVAL ;strcpy (t->name,"Television" ); t->type =V4L2_TUNER_ANALOG_TV ;
drivers/media/video/saa7134/saa7134-tvaudio.c +1 -1
@@ -1006,7 +1006,7 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)int saa7134_tvaudio_fini (struct saa7134_dev *dev) {/* shutdown tvaudio thread */ -if (dev->thread.pid >=0 ) { +if (dev->thread.pid >0 ) { dev->thread.shutdown =1 ;wake_up_interruptible (&dev->thread.wq);wait_for_completion (&dev->thread.exit);
drivers/net/bnx2.c +15 -10
@@ -54,8 +54,8 @@#define DRV_MODULE_NAME "bnx2"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "1.5.8.1" -#define DRV_MODULE_RELDATE "May 7, 2007" +#define DRV_MODULE_VERSION "1.5.8.2" +#define DRV_MODULE_RELDATE "June 5, 2007"#define RUN_AT (x) (jiffies + (x))
@@ -1550,6 +1550,7 @@ bnx2_init_context(struct bnx2 *bp) vcid =96 ;while (vcid) {u32 vcid_addr, pcid_addr, offset; +int i; vcid--;
@@ -1570,16 +1571,20 @@ bnx2_init_context(struct bnx2 *bp) pcid_addr = vcid_addr; } -REG_WR (bp,BNX2_CTX_VIRT_ADDR ,0x00 ); -REG_WR (bp,BNX2_CTX_PAGE_TBL , pcid_addr); +for (i =0 ; i < (CTX_SIZE /PHY_CTX_SIZE ); i++) { + vcid_addr += (i <<PHY_CTX_SHIFT ); + pcid_addr += (i <<PHY_CTX_SHIFT ); -/* Zero out the context. */ -for (offset =0 ; offset <PHY_CTX_SIZE ; offset +=4 ) { -CTX_WR (bp,0x00 , offset,0 ); - } +REG_WR (bp,BNX2_CTX_VIRT_ADDR ,0x00 ); +REG_WR (bp,BNX2_CTX_PAGE_TBL , pcid_addr); -REG_WR (bp,BNX2_CTX_VIRT_ADDR , vcid_addr); -REG_WR (bp,BNX2_CTX_PAGE_TBL , pcid_addr); +/* Zero out the context. */ +for (offset =0 ; offset <PHY_CTX_SIZE ; offset +=4 ) +CTX_WR (bp,0x00 , offset,0 ); + +REG_WR (bp,BNX2_CTX_VIRT_ADDR , vcid_addr); +REG_WR (bp,BNX2_CTX_PAGE_TBL , pcid_addr); + } } }
drivers/net/sky2.c +8 -1
@@ -95,7 +95,7 @@ static int disable_msi = 0;module_param (disable_msi, int,0 );MODULE_PARM_DESC (disable_msi,"Disable Message Signaled Interrupt (MSI)" ); -static int idle_timeout =0 ; +static int idle_timeout =100 ;module_param (idle_timeout, int,0 );MODULE_PARM_DESC (idle_timeout,"Watchdog timer for lost interrupts (ms)" );
@@ -2433,6 +2433,13 @@ static int sky2_poll(struct net_device *dev0, int *budget) work_done =sky2_status_intr (hw, work_limit);if (work_done < work_limit) { +/* Bug/Errata workaround? +* Need to kick the TX irq moderation timer. +*/ +if (sky2_read8 (hw,STAT_TX_TIMER_CTRL ) ==TIM_START ) { +sky2_write8 (hw,STAT_TX_TIMER_CTRL ,TIM_STOP ); +sky2_write8 (hw,STAT_TX_TIMER_CTRL ,TIM_START ); + }netif_rx_complete (dev0);sky2_read32 (hw,B0_Y2_SP_LISR );
drivers/serial/mpsc.c +2 -1
@@ -502,7 +502,8 @@ mpsc_sdma_intr_ack(struct mpsc_port_info *pi)if (pi->mirror_regs) pi->shared_regs->SDMA_INTR_CAUSE_m =0 ; -writel (0 , pi->shared_regs->sdma_intr_base +SDMA_INTR_CAUSE ); +writeb (0x00 , pi->shared_regs->sdma_intr_base +SDMA_INTR_CAUSE + + pi->port.line);return ; }
include/linux/sched.h +1 -0
@@ -1138,6 +1138,7 @@ static inline void put_task_struct(struct task_struct *t)/* Not implemented yet, only for 486*/ #define PF_STARTING 0x00000002/* being created */ #define PF_EXITING 0x00000004/* getting shut down */ +#define PF_EXITPIDONE 0x00000008/* pi exit done on shut down */ #define PF_FORKNOEXEC 0x00000040/* forked but didn't exec */ #define PF_SUPERPRIV 0x00000100/* used super-user privileges */ #define PF_DUMPCORE 0x00000200/* dumped core */
ipc/shm.c +3 -1
@@ -254,8 +254,10 @@ struct mempolicy *shm_get_policy(struct vm_area_struct *vma, unsigned long addr)if (sfd->vm_ops->get_policy) pol = sfd->vm_ops->get_policy (vma, addr); -else +else if (vma->vm_policy) pol = vma->vm_policy; +else + pol = current->mempolicy; return pol; }#endif
kernel/auditfilter.c +1 -1
@@ -905,7 +905,7 @@ static void audit_update_watch(struct audit_parent *parent,/* If the update involves invalidating rules, do the inode-based * filtering now, so we don't omit records. */ -if (invalidating && +if (invalidating && current->audit_context &&audit_filter_inodes (current, current->audit_context) ==AUDIT_RECORD_CONTEXT )audit_set_auditable (current->audit_context);
kernel/exit.c +22 -0
@@ -884,13 +884,29 @@ fastcall NORET_TYPE void do_exit(long code)if (unlikely (tsk->flags &PF_EXITING )) {printk (KERN_ALERT "Fixing recursive fault but reboot is needed!\n" ); +/* +* We can do this unlocked here. The futex code uses +* this flag just to verify whether the pi state +* cleanup has been done or not. In the worst case it +* loops once more. We pretend that the cleanup was +* done as there is no way to return. Either the +* OWNER_DIED bit is set by now or we push the blocked +* task into the wait for ever nirwana as well. +*/ + tsk->flags |=PF_EXITPIDONE ;if (tsk->io_context)exit_io_context ();set_current_state (TASK_UNINTERRUPTIBLE );schedule (); } +/* +* tsk->flags are checked in the futex code to protect against +* an exiting task cleaning up the robust pi futexes. +*/ +spin_lock_irq (&tsk->pi_lock); tsk->flags |=PF_EXITING ; +spin_unlock_irq (&tsk->pi_lock);if (unlikely (in_atomic ())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
@@ -957,6 +973,12 @@ fastcall NORET_TYPE void do_exit(long code)* Make sure we are holding no locks: */ debug_check_no_locks_held (tsk); +/* +* We can do this unlocked here. The futex code uses this flag +* just to verify whether the pi state cleanup has been done +* or not. In the worst case it loops once more. +*/ + tsk->flags |=PF_EXITPIDONE ;if (tsk->io_context)exit_io_context ();
kernel/futex.c +133 -72
321 lines not on this page · raw message
kernel/posix-timers.c +33 -2
@@ -354,9 +354,40 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)* it should be restarted. */ if (timr->it.real.interval.tv64 !=0 ) { +ktime_t now =hrtimer_cb_get_time (timer); + +/* +* FIXME: What we really want, is to stop this +* timer completely and restart it in case the +* SIG_IGN is removed. This is a non trivial +* change which involves sighand locking +* (sigh !), which we don't want to do late in +* the release cycle. +* +* For now we just let timers with an interval +* less than a jiffie expire every jiffie to +* avoid softirq starvation in case of SIG_IGN +* and a very small interval, which would put +* the timer right back on the softirq pending +* list. By moving now ahead of time we trick +* hrtimer_forward() to expire the timer +* later, while we still maintain the overrun +* accuracy, but have some inconsistency in +* the timer_gettime() case. This is at least +* better than a starved softirq. A more +* complex fix which solves also another related +* inconsistency is already in the pipeline. +*/ +#ifdef CONFIG_HIGH_RES_TIMERS + { +ktime_t kj =ktime_set (0 ,NSEC_PER_SEC /HZ ); + +if (timr->it.real.interval.tv64 < kj.tv64) + now =ktime_add (now, kj); + } +#endif timr->it_overrun += -hrtimer_forward (timer, -hrtimer_cb_get_time (timer), +hrtimer_forward (timer, now, timr->it.real.interval); ret =HRTIMER_RESTART ; ++timr->it_requeue_pending;
kernel/rtmutex.c +22 -2
@@ -212,6 +212,19 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,if (!waiter || !waiter->task) goto out_unlock_pi; +/* +* Check the orig_waiter state. After we dropped the locks, +* the previous owner of the lock might have released the lock +* and made us the pending owner: +*/ +if (orig_waiter && !orig_waiter->task) + goto out_unlock_pi; + +/* +* Drop out, when the task has no waiters. Note, +* top_waiter can be NULL, when we are in the deboosting +* mode! +*/ if (top_waiter && (!task_has_pi_waiters (task) || top_waiter !=task_top_pi_waiter (task))) goto out_unlock_pi;
@@ -659,9 +672,16 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,* all over without going into schedule to try * to get the lock now: */ -if (unlikely (!waiter.task)) +if (unlikely (!waiter.task)) { +/* +* Reset the return value. We might +* have returned with -EDEADLK and the +* owner released the lock while we +* were walking the pi chain. +*/ + ret =0 ;continue ; - + }if (unlikely (ret))break ; }
kernel/sched.c +13 -9
@@ -2831,17 +2831,21 @@ static void idle_balance(int this_cpu, struct rq *this_rq)unsigned long next_balance = jiffies +60 *HZ ;for_each_domain (this_cpu, sd) { -if (sd->flags &SD_BALANCE_NEWIDLE ) { +unsigned long interval; + +if (!(sd->flags &SD_LOAD_BALANCE )) +continue ; + +if (sd->flags &SD_BALANCE_NEWIDLE )/* If we've pulled tasks over stop searching: */ pulled_task =load_balance_newidle (this_cpu, - this_rq, sd); -if (time_after (next_balance, - sd->last_balance + sd->balance_interval)) - next_balance = sd->last_balance - + sd->balance_interval; -if (pulled_task) -break ; - } + this_rq, sd); + + interval =msecs_to_jiffies (sd->balance_interval); +if (time_after (next_balance, sd->last_balance + interval)) + next_balance = sd->last_balance + interval; +if (pulled_task) +break ; }if (!pulled_task)/*
kernel/time/ntp.c +0 -2
@@ -120,7 +120,6 @@ void second_overflow(void)*/ time_interpolator_update (-NSEC_PER_SEC ); time_state =TIME_OOP ; -clock_was_set ();printk (KERN_NOTICE "Clock: inserting leap second " "23:59:60 UTC\n" ); }
@@ -135,7 +134,6 @@ void second_overflow(void)*/ time_interpolator_update (NSEC_PER_SEC ); time_state =TIME_WAIT ; -clock_was_set ();printk (KERN_NOTICE "Clock: deleting leap second " "23:59:59 UTC\n" ); }
mm/rmap.c +1 -23
@@ -53,24 +53,6 @@struct kmem_cache *anon_vma_cachep; -static inline void validate_anon_vma (struct vm_area_struct *find_vma) -{ -#ifdef CONFIG_DEBUG_VM -struct anon_vma *anon_vma = find_vma->anon_vma; -struct vm_area_struct *vma; -unsigned int mapcount =0 ; -int found =0 ; - -list_for_each_entry (vma, &anon_vma->head, anon_vma_node) { - mapcount++; -BUG_ON (mapcount >100000 ); -if (vma == find_vma) - found =1 ; - } -BUG_ON (!found); -#endif -} -/* This must be called under the mmap_sem. */ int anon_vma_prepare (struct vm_area_struct *vma) {
@@ -121,10 +103,8 @@ void __anon_vma_link(struct vm_area_struct *vma) {struct anon_vma *anon_vma = vma->anon_vma; -if (anon_vma) { +if (anon_vma)list_add_tail (&vma->anon_vma_node, &anon_vma->head); -validate_anon_vma (vma); - } }void anon_vma_link (struct vm_area_struct *vma)
@@ -134,7 +114,6 @@ void anon_vma_link(struct vm_area_struct *vma)if (anon_vma) {spin_lock (&anon_vma->lock);list_add_tail (&vma->anon_vma_node, &anon_vma->head); -validate_anon_vma (vma);spin_unlock (&anon_vma->lock); } }
@@ -148,7 +127,6 @@ void anon_vma_unlink(struct vm_area_struct *vma)return ;spin_lock (&anon_vma->lock); -validate_anon_vma (vma);list_del (&vma->anon_vma_node);/* We must garbage collect the anon_vma if it's empty */