Merge branch 'akpm' (Andrew's patch-bomb)

Merge fixes from Andrew Morton. Random drivers and some VM fixes. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (17 commits) mm: compaction: Abort async compaction if locks are contended or taking too long mm: have order > 0 compaction start near a pageblock with free pages rapidio/tsi721: fix unused variable compiler warning rapidio/tsi721: fix inbound doorbell interrupt handling drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode mm: correct page->pfmemalloc to fix deactivate_slab regression drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes mm/compaction.c: fix deferring compaction mistake drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources string: do not export memweight() to userspace hugetlb: update hugetlbpage.txt checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO mm: hugetlbfs: correctly populate shared pmd cciss: fix incorrect scsi status reporting Documentation: update mount option in filesystem/vfat.txt mm: change nr_ptes BUG_ON to WARN_ON cs5535-clockevt: typo, it's MFGPT, not MFPGT

Merge branch 'akpm' (Andrew's patch-bomb)
Merge fixes from Andrew Morton. Random drivers and some VM fixes. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (17 commits) mm: compaction: Abort async compaction if locks are contended or taking too long mm: have order > 0 compaction start near a pageblock with free pages rapidio/tsi721: fix unused variable compiler warning rapidio/tsi721: fix inbound doorbell interrupt handling drivers/rtc/rtc-rs5c348.c: fix hour decoding in 12-hour mode mm: correct page->pfmemalloc to fix deactivate_slab regression drivers/rtc/rtc-pcf2123.c: initialize dynamic sysfs attributes mm/compaction.c: fix deferring compaction mistake drivers/misc/sgi-xp/xpc_uv.c: SGI XPC fails to load when cpu 0 is out of IRQ resources string: do not export memweight() to userspace hugetlb: update hugetlbpage.txt checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO mm: hugetlbfs: correctly populate shared pmd cciss: fix incorrect scsi status reporting Documentation: update mount option in filesystem/vfat.txt mm: change nr_ptes BUG_ON to WARN_ON cs5535-clockevt: typo, it's MFGPT, not MFPGT
Linus Torvalds
2 parents a484147a52 c67fe3752a
Showing 16 changed files Side-by-side Diff
Documentation/filesystems/vfat.txt
Documentation/vm/hugetlbpage.txt
arch/x86/mm/hugetlbpage.c
drivers/block/cciss_scsi.c
drivers/clocksource/cs5535-clockevt.c
drivers/misc/sgi-xp/xpc_uv.c
drivers/rapidio/devices/tsi721.c
drivers/rtc/rtc-pcf2123.c
drivers/rtc/rtc-rs5c348.c
include/linux/compaction.h
include/linux/string.h
mm/compaction.c
mm/internal.h
mm/mmap.c
mm/page_alloc.c
scripts/checkpatch.pl
@@ -137,6 +137,17 @@
 		 without doing anything or remount the partition in
 		 read-only mode (default behavior).
  
+discard       -- If set, issues discard/TRIM commands to the block
+		 device when blocks are freed. This is useful for SSD devices
+		 and sparse/thinly-provisoned LUNs.
+
+nfs           -- This option maintains an index (cache) of directory
+		 inodes by i_logstart which is used by the nfs-related code to
+		 improve look-ups.
+
+		 Enable this only if you want to export the FAT filesystem
+		 over NFS
+
 <bool>: 0,1,yes,no,true,false
  
 TODO
@@ -299,12 +299,18 @@
 *******************************************************************
  
 /*
- * hugepage-shm:  see Documentation/vm/hugepage-shm.c
+ * map_hugetlb: see tools/testing/selftests/vm/map_hugetlb.c
  */
  
 *******************************************************************
  
 /*
- * hugepage-mmap:  see Documentation/vm/hugepage-mmap.c
+ * hugepage-shm:  see tools/testing/selftests/vm/hugepage-shm.c
+ */
+
+*******************************************************************
+
+/*
+ * hugepage-mmap:  see tools/testing/selftests/vm/hugepage-mmap.c
  */
@@ -56,9 +56,16 @@
 }
  
 /*
- * search for a shareable pmd page for hugetlb.
+ * Search for a shareable pmd page for hugetlb. In any case calls pmd_alloc()
+ * and returns the corresponding pte. While this is not necessary for the
+ * !shared pmd case because we can allocate the pmd later as well, it makes the
+ * code much cleaner. pmd allocation is essential for the shared case because
+ * pud has to be populated inside the same i_mmap_mutex section - otherwise
+ * racing tasks could either miss the sharing (see huge_pte_offset) or select a
+ * bad pmd for sharing.
  */
-static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
+static pte_t *
+huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
 {
 	struct vm_area_struct *vma = find_vma(mm, addr);
 	struct address_space *mapping = vma->vm_file->f_mapping;
  
@@ -68,9 +75,10 @@
 	struct vm_area_struct *svma;
 	unsigned long saddr;
 	pte_t *spte = NULL;
+	pte_t *pte;
  
 	if (!vma_shareable(vma, addr))
-		return;
+		return (pte_t *)pmd_alloc(mm, pud, addr);
  
 	mutex_lock(&mapping->i_mmap_mutex);
 	vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
  
@@ -97,7 +105,9 @@
 		put_page(virt_to_page(spte));
 	spin_unlock(&mm->page_table_lock);
 out:
+	pte = (pte_t *)pmd_alloc(mm, pud, addr);
 	mutex_unlock(&mapping->i_mmap_mutex);
+	return pte;
 }
  
 /*
@@ -142,8 +152,9 @@
 		} else {
 			BUG_ON(sz != PMD_SIZE);
 			if (pud_none(*pud))
-				huge_pmd_share(mm, addr, pud);
-			pte = (pte_t *) pmd_alloc(mm, pud, addr);
+				pte = huge_pmd_share(mm, addr, pud);
+			else
+				pte = (pte_t *)pmd_alloc(mm, pud, addr);
 		}
 	}
 	BUG_ON(pte && !pte_none(*pte) && !pte_huge(*pte));
@@ -763,16 +763,7 @@
 		{
 			case CMD_TARGET_STATUS:
 				/* Pass it up to the upper layers... */
-				if( ei->ScsiStatus)
-                		{
-#if 0
-                    			printk(KERN_WARNING "cciss: cmd %p "
-						"has SCSI Status = %x\n",
-						c, ei->ScsiStatus);
-#endif
-					cmd->result |= (ei->ScsiStatus << 1);
-                		}
-				else {  /* scsi status is zero??? How??? */
+				if (!ei->ScsiStatus) {
  
 	/* Ordinarily, this case should never happen, but there is a bug
 	   in some released firmware revisions that allows it to happen
@@ -53,7 +53,7 @@
 #define MFGPT_PERIODIC (MFGPT_HZ / HZ)
  
 /*
- * The MFPGT timers on the CS5536 provide us with suitable timers to use
+ * The MFGPT timers on the CS5536 provide us with suitable timers to use
  * as clock event sources - not as good as a HPET or APIC, but certainly
  * better than the PIT.  This isn't a general purpose MFGPT driver, but
  * a simplified one designed specifically to act as a clock event source.
@@ -144,7 +144,7 @@
  
 	timer = cs5535_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
 	if (!timer) {
-		printk(KERN_ERR DRV_NAME ": Could not allocate MFPGT timer\n");
+		printk(KERN_ERR DRV_NAME ": Could not allocate MFGPT timer\n");
 		return -ENODEV;
 	}
 	cs5535_event_clock = timer;
@@ -18,6 +18,8 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/device.h>
+#include <linux/cpu.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <asm/uv/uv_hub.h>
@@ -59,6 +61,8 @@
 					 XPC_NOTIFY_MSG_SIZE_UV)
 #define XPC_NOTIFY_IRQ_NAME		"xpc_notify"
  
+static int xpc_mq_node = -1;
+
 static struct xpc_gru_mq_uv *xpc_activate_mq_uv;
 static struct xpc_gru_mq_uv *xpc_notify_mq_uv;
  
  
@@ -109,11 +113,8 @@
 #if defined CONFIG_X86_64
 	mq->irq = uv_setup_irq(irq_name, cpu, mq->mmr_blade, mq->mmr_offset,
 			UV_AFFINITY_CPU);
-	if (mq->irq < 0) {
-		dev_err(xpc_part, "uv_setup_irq() returned error=%d\n",
-			-mq->irq);
+	if (mq->irq < 0)
 		return mq->irq;
-	}
  
 	mq->mmr_value = uv_read_global_mmr64(mmr_pnode, mq->mmr_offset);
  
@@ -238,8 +239,9 @@
 	mq->mmr_blade = uv_cpu_to_blade_id(cpu);
  
 	nid = cpu_to_node(cpu);
-	page = alloc_pages_exact_node(nid, GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
-				pg_order);
+	page = alloc_pages_exact_node(nid,
+				      GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+				      pg_order);
 	if (page == NULL) {
 		dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "
 			"bytes of memory on nid=%d for GRU mq\n", mq_size, nid);
  
@@ -1731,9 +1733,50 @@
 	.notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv,
 };
  
+static int
+xpc_init_mq_node(int nid)
+{
+	int cpu;
+
+	get_online_cpus();
+
+	for_each_cpu(cpu, cpumask_of_node(nid)) {
+		xpc_activate_mq_uv =
+			xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, nid,
+					     XPC_ACTIVATE_IRQ_NAME,
+					     xpc_handle_activate_IRQ_uv);
+		if (!IS_ERR(xpc_activate_mq_uv))
+			break;
+	}
+	if (IS_ERR(xpc_activate_mq_uv)) {
+		put_online_cpus();
+		return PTR_ERR(xpc_activate_mq_uv);
+	}
+
+	for_each_cpu(cpu, cpumask_of_node(nid)) {
+		xpc_notify_mq_uv =
+			xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, nid,
+					     XPC_NOTIFY_IRQ_NAME,
+					     xpc_handle_notify_IRQ_uv);
+		if (!IS_ERR(xpc_notify_mq_uv))
+			break;
+	}
+	if (IS_ERR(xpc_notify_mq_uv)) {
+		xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
+		put_online_cpus();
+		return PTR_ERR(xpc_notify_mq_uv);
+	}
+
+	put_online_cpus();
+	return 0;
+}
+
 int
 xpc_init_uv(void)
 {
+	int nid;
+	int ret = 0;
+
 	xpc_arch_ops = xpc_arch_ops_uv;
  
 	if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
  
  
@@ -1742,21 +1785,21 @@
 		return -E2BIG;
 	}
  
-	xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0,
-						  XPC_ACTIVATE_IRQ_NAME,
-						  xpc_handle_activate_IRQ_uv);
-	if (IS_ERR(xpc_activate_mq_uv))
-		return PTR_ERR(xpc_activate_mq_uv);
+	if (xpc_mq_node < 0)
+		for_each_online_node(nid) {
+			ret = xpc_init_mq_node(nid);
  
-	xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0,
-						XPC_NOTIFY_IRQ_NAME,
-						xpc_handle_notify_IRQ_uv);
-	if (IS_ERR(xpc_notify_mq_uv)) {
-		xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
-		return PTR_ERR(xpc_notify_mq_uv);
-	}
+			if (!ret)
+				break;
+		}
+	else
+		ret = xpc_init_mq_node(xpc_mq_node);
  
-	return 0;
+	if (ret < 0)
+		dev_err(xpc_part, "xpc_init_mq_node() returned error=%d\n",
+			-ret);
+
+	return ret;
 }
  
 void
@@ -1765,4 +1808,7 @@
 	xpc_destroy_gru_mq_uv(xpc_notify_mq_uv);
 	xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
 }
+
+module_param(xpc_mq_node, int, 0);
+MODULE_PARM_DESC(xpc_mq_node, "Node number on which to allocate message queues.");
@@ -435,6 +435,9 @@
 				" info %4.4x\n", DBELL_SID(idb.bytes),
 				DBELL_TID(idb.bytes), DBELL_INF(idb.bytes));
 		}
+
+		wr_ptr = ioread32(priv->regs +
+				  TSI721_IDQ_WP(IDB_QUEUE)) % IDB_QSIZE;
 	}
  
 	iowrite32(rd_ptr & (IDB_QSIZE - 1),
@@ -445,6 +448,10 @@
 	regval |= TSI721_SR_CHINT_IDBQRCV;
 	iowrite32(regval,
 		priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
+
+	wr_ptr = ioread32(priv->regs + TSI721_IDQ_WP(IDB_QUEUE)) % IDB_QSIZE;
+	if (wr_ptr != rd_ptr)
+		schedule_work(&priv->idb_work);
 }
  
 /**
@@ -2212,7 +2219,7 @@
 				  const struct pci_device_id *id)
 {
 	struct tsi721_device *priv;
-	int i, cap;
+	int cap;
 	int err;
 	u32 regval;
  
  
@@ -2232,11 +2239,14 @@
 	priv->pdev = pdev;
  
 #ifdef DEBUG
+	{
+	int i;
 	for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
 		dev_dbg(&pdev->dev, "res[%d] @ 0x%llx (0x%lx, 0x%lx)\n",
 			i, (unsigned long long)pci_resource_start(pdev, i),
 			(unsigned long)pci_resource_len(pdev, i),
 			pci_resource_flags(pdev, i));
+	}
 	}
 #endif
 	/*
@@ -43,6 +43,7 @@
 #include <linux/rtc.h>
 #include <linux/spi/spi.h>
 #include <linux/module.h>
+#include <linux/sysfs.h>
  
 #define DRV_VERSION "0.6"
  
@@ -292,6 +293,7 @@
 	pdata->rtc = rtc;
  
 	for (i = 0; i < 16; i++) {
+		sysfs_attr_init(&pdata->regs[i].attr.attr);
 		sprintf(pdata->regs[i].name, "%1x", i);
 		pdata->regs[i].attr.attr.mode = S_IRUGO | S_IWUSR;
 		pdata->regs[i].attr.attr.name = pdata->regs[i].name;
@@ -122,9 +122,12 @@
 	tm->tm_min = bcd2bin(rxbuf[RS5C348_REG_MINS] & RS5C348_MINS_MASK);
 	tm->tm_hour = bcd2bin(rxbuf[RS5C348_REG_HOURS] & RS5C348_HOURS_MASK);
 	if (!pdata->rtc_24h) {
-		tm->tm_hour %= 12;
-		if (rxbuf[RS5C348_REG_HOURS] & RS5C348_BIT_PM)
+		if (rxbuf[RS5C348_REG_HOURS] & RS5C348_BIT_PM) {
+			tm->tm_hour -= 20;
+			tm->tm_hour %= 12;
 			tm->tm_hour += 12;
+		} else
+			tm->tm_hour %= 12;
 	}
 	tm->tm_wday = bcd2bin(rxbuf[RS5C348_REG_WDAY] & RS5C348_WDAY_MASK);
 	tm->tm_mday = bcd2bin(rxbuf[RS5C348_REG_DAY] & RS5C348_DAY_MASK);
@@ -22,7 +22,7 @@
 extern int fragmentation_index(struct zone *zone, unsigned int order);
 extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
 			int order, gfp_t gfp_mask, nodemask_t *mask,
-			bool sync);
+			bool sync, bool *contended);
 extern int compact_pgdat(pg_data_t *pgdat, int order);
 extern unsigned long compaction_suitable(struct zone *zone, int order);
  
@@ -64,7 +64,7 @@
 #else
 static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,
 			int order, gfp_t gfp_mask, nodemask_t *nodemask,
-			bool sync)
+			bool sync, bool *contended)
 {
 	return COMPACT_CONTINUE;
 }
@@ -144,9 +144,9 @@
 {
 	return strncmp(str, prefix, strlen(prefix)) == 0;
 }
-#endif
  
 extern size_t memweight(const void *ptr, size_t bytes);
  
+#endif /* __KERNEL__ */
 #endif /* _LINUX_STRING_H_ */
@@ -51,6 +51,47 @@
 }
  
 /*
+ * Compaction requires the taking of some coarse locks that are potentially
+ * very heavily contended. Check if the process needs to be scheduled or
+ * if the lock is contended. For async compaction, back out in the event
+ * if contention is severe. For sync compaction, schedule.
+ *
+ * Returns true if the lock is held.
+ * Returns false if the lock is released and compaction should abort
+ */
+static bool compact_checklock_irqsave(spinlock_t *lock, unsigned long *flags,
+				      bool locked, struct compact_control *cc)
+{
+	if (need_resched() || spin_is_contended(lock)) {
+		if (locked) {
+			spin_unlock_irqrestore(lock, *flags);
+			locked = false;
+		}
+
+		/* async aborts if taking too long or contended */
+		if (!cc->sync) {
+			if (cc->contended)
+				*cc->contended = true;
+			return false;
+		}
+
+		cond_resched();
+		if (fatal_signal_pending(current))
+			return false;
+	}
+
+	if (!locked)
+		spin_lock_irqsave(lock, *flags);
+	return true;
+}
+
+static inline bool compact_trylock_irqsave(spinlock_t *lock,
+			unsigned long *flags, struct compact_control *cc)
+{
+	return compact_checklock_irqsave(lock, flags, false, cc);
+}
+
+/*
  * Isolate free pages onto a private freelist. Caller must hold zone->lock.
  * If @strict is true, will abort returning 0 on any invalid PFNs or non-free
  * pages inside of the pageblock (even though it may still end up isolating
@@ -173,7 +214,7 @@
 }
  
 /* Update the number of anon and file isolated pages in the zone */
-static void acct_isolated(struct zone *zone, struct compact_control *cc)
+static void acct_isolated(struct zone *zone, bool locked, struct compact_control *cc)
 {
 	struct page *page;
 	unsigned int count[2] = { 0, };
@@ -181,8 +222,14 @@
 	list_for_each_entry(page, &cc->migratepages, lru)
 		count[!!page_is_file_cache(page)]++;
  
-	__mod_zone_page_state(zone, NR_ISOLATED_ANON, count[0]);
-	__mod_zone_page_state(zone, NR_ISOLATED_FILE, count[1]);
+	/* If locked we can use the interrupt unsafe versions */
+	if (locked) {
+		__mod_zone_page_state(zone, NR_ISOLATED_ANON, count[0]);
+		__mod_zone_page_state(zone, NR_ISOLATED_FILE, count[1]);
+	} else {
+		mod_zone_page_state(zone, NR_ISOLATED_ANON, count[0]);
+		mod_zone_page_state(zone, NR_ISOLATED_FILE, count[1]);
+	}
 }
  
 /* Similar to reclaim, but different enough that they don't share logic */
@@ -228,6 +275,8 @@
 	struct list_head *migratelist = &cc->migratepages;
 	isolate_mode_t mode = 0;
 	struct lruvec *lruvec;
+	unsigned long flags;
+	bool locked;
  
 	/*
 	 * Ensure that there are not too many pages isolated from the LRU
  
  
  
  
@@ -247,26 +296,23 @@
  
 	/* Time to isolate some pages for migration */
 	cond_resched();
-	spin_lock_irq(&zone->lru_lock);
+	spin_lock_irqsave(&zone->lru_lock, flags);
+	locked = true;
 	for (; low_pfn < end_pfn; low_pfn++) {
 		struct page *page;
-		bool locked = true;
  
 		/* give a chance to irqs before checking need_resched() */
 		if (!((low_pfn+1) % SWAP_CLUSTER_MAX)) {
-			spin_unlock_irq(&zone->lru_lock);
+			spin_unlock_irqrestore(&zone->lru_lock, flags);
 			locked = false;
 		}
-		if (need_resched() || spin_is_contended(&zone->lru_lock)) {
-			if (locked)
-				spin_unlock_irq(&zone->lru_lock);
-			cond_resched();
-			spin_lock_irq(&zone->lru_lock);
-			if (fatal_signal_pending(current))
-				break;
-		} else if (!locked)
-			spin_lock_irq(&zone->lru_lock);
  
+		/* Check if it is ok to still hold the lock */
+		locked = compact_checklock_irqsave(&zone->lru_lock, &flags,
+								locked, cc);
+		if (!locked)
+			break;
+
 		/*
 		 * migrate_pfn does not necessarily start aligned to a
 		 * pageblock. Ensure that pfn_valid is called when moving
  
@@ -349,9 +395,10 @@
 		}
 	}
  
-	acct_isolated(zone, cc);
+	acct_isolated(zone, locked, cc);
  
-	spin_unlock_irq(&zone->lru_lock);
+	if (locked)
+		spin_unlock_irqrestore(&zone->lru_lock, flags);
  
 	trace_mm_compaction_isolate_migratepages(nr_scanned, nr_isolated);
  
@@ -384,6 +431,20 @@
 }
  
 /*
+ * Returns the start pfn of the last page block in a zone.  This is the starting
+ * point for full compaction of a zone.  Compaction searches for free pages from
+ * the end of each zone, while isolate_freepages_block scans forward inside each
+ * page block.
+ */
+static unsigned long start_free_pfn(struct zone *zone)
+{
+	unsigned long free_pfn;
+	free_pfn = zone->zone_start_pfn + zone->spanned_pages;
+	free_pfn &= ~(pageblock_nr_pages-1);
+	return free_pfn;
+}
+
+/*
  * Based on information in the current compact_control, find blocks
  * suitable for isolating free pages from and then isolate them.
  */
@@ -422,17 +483,6 @@
 					pfn -= pageblock_nr_pages) {
 		unsigned long isolated;
  
-		/*
-		 * Skip ahead if another thread is compacting in the area
-		 * simultaneously. If we wrapped around, we can only skip
-		 * ahead if zone->compact_cached_free_pfn also wrapped to
-		 * above our starting point.
-		 */
-		if (cc->order > 0 && (!cc->wrapped ||
-				      zone->compact_cached_free_pfn >
-				      cc->start_free_pfn))
-			pfn = min(pfn, zone->compact_cached_free_pfn);
-
 		if (!pfn_valid(pfn))
 			continue;
  
@@ -458,7 +508,16 @@
 		 * are disabled
 		 */
 		isolated = 0;
-		spin_lock_irqsave(&zone->lock, flags);
+
+		/*
+		 * The zone lock must be held to isolate freepages. This
+		 * unfortunately this is a very coarse lock and can be
+		 * heavily contended if there are parallel allocations
+		 * or parallel compactions. For async compaction do not
+		 * spin on the lock
+		 */
+		if (!compact_trylock_irqsave(&zone->lock, &flags, cc))
+			break;
 		if (suitable_migration_target(page)) {
 			end_pfn = min(pfn + pageblock_nr_pages, zone_end_pfn);
 			isolated = isolate_freepages_block(pfn, end_pfn,
@@ -474,7 +533,15 @@
 		 */
 		if (isolated) {
 			high_pfn = max(high_pfn, pfn);
-			if (cc->order > 0)
+
+			/*
+			 * If the free scanner has wrapped, update
+			 * compact_cached_free_pfn to point to the highest
+			 * pageblock with free pages. This reduces excessive
+			 * scanning of full pageblocks near the end of the
+			 * zone
+			 */
+			if (cc->order > 0 && cc->wrapped)
 				zone->compact_cached_free_pfn = high_pfn;
 		}
 	}
@@ -484,6 +551,11 @@
  
 	cc->free_pfn = high_pfn;
 	cc->nr_freepages = nr_freepages;
+
+	/* If compact_cached_free_pfn is reset then set it now */
+	if (cc->order > 0 && !cc->wrapped &&
+			zone->compact_cached_free_pfn == start_free_pfn(zone))
+		zone->compact_cached_free_pfn = high_pfn;
 }
  
 /*
@@ -570,20 +642,6 @@
 	return ISOLATE_SUCCESS;
 }
  
-/*
- * Returns the start pfn of the last page block in a zone.  This is the starting
- * point for full compaction of a zone.  Compaction searches for free pages from
- * the end of each zone, while isolate_freepages_block scans forward inside each
- * page block.
- */
-static unsigned long start_free_pfn(struct zone *zone)
-{
-	unsigned long free_pfn;
-	free_pfn = zone->zone_start_pfn + zone->spanned_pages;
-	free_pfn &= ~(pageblock_nr_pages-1);
-	return free_pfn;
-}
-
 static int compact_finished(struct zone *zone,
 			    struct compact_control *cc)
 {
@@ -771,7 +829,7 @@
  
 static unsigned long compact_zone_order(struct zone *zone,
 				 int order, gfp_t gfp_mask,
-				 bool sync)
+				 bool sync, bool *contended)
 {
 	struct compact_control cc = {
 		.nr_freepages = 0,
@@ -780,6 +838,7 @@
 		.migratetype = allocflags_to_migratetype(gfp_mask),
 		.zone = zone,
 		.sync = sync,
+		.contended = contended,
 	};
 	INIT_LIST_HEAD(&cc.freepages);
 	INIT_LIST_HEAD(&cc.migratepages);
@@ -801,7 +860,7 @@
  */
 unsigned long try_to_compact_pages(struct zonelist *zonelist,
 			int order, gfp_t gfp_mask, nodemask_t *nodemask,
-			bool sync)
+			bool sync, bool *contended)
 {
 	enum zone_type high_zoneidx = gfp_zone(gfp_mask);
 	int may_enter_fs = gfp_mask & __GFP_FS;
@@ -825,7 +884,8 @@
 								nodemask) {
 		int status;
  
-		status = compact_zone_order(zone, order, gfp_mask, sync);
+		status = compact_zone_order(zone, order, gfp_mask, sync,
+						contended);
 		rc = max(status, rc);
  
 		/* If a normal allocation would succeed, stop compacting */
@@ -861,7 +921,7 @@
 		if (cc->order > 0) {
 			int ok = zone_watermark_ok(zone, cc->order,
 						low_wmark_pages(zone), 0, 0);
-			if (ok && cc->order > zone->compact_order_failed)
+			if (ok && cc->order >= zone->compact_order_failed)
 				zone->compact_order_failed = cc->order + 1;
 			/* Currently async compaction is never deferred. */
 			else if (!ok && cc->sync)
@@ -130,6 +130,7 @@
 	int order;			/* order a direct compactor needs */
 	int migratetype;		/* MOVABLE, RECLAIMABLE etc */
 	struct zone *zone;
+	bool *contended;		/* True if a lock was contended */
 };
  
 unsigned long
@@ -2309,7 +2309,7 @@
 	}
 	vm_unacct_memory(nr_accounted);
  
-	BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
+	WARN_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
 }
  
 /* Insert vm structure into process list sorted by address
@@ -1928,6 +1928,17 @@
 		zlc_active = 0;
 		goto zonelist_scan;
 	}
+
+	if (page)
+		/*
+		 * page->pfmemalloc is set when ALLOC_NO_WATERMARKS was
+		 * necessary to allocate the page. The expectation is
+		 * that the caller is taking steps that will free more
+		 * memory. The caller should avoid the page being used
+		 * for !PFMEMALLOC purposes.
+		 */
+		page->pfmemalloc = !!(alloc_flags & ALLOC_NO_WATERMARKS);
+
 	return page;
 }
  
@@ -2091,7 +2102,7 @@
 	struct zonelist *zonelist, enum zone_type high_zoneidx,
 	nodemask_t *nodemask, int alloc_flags, struct zone *preferred_zone,
 	int migratetype, bool sync_migration,
-	bool *deferred_compaction,
+	bool *contended_compaction, bool *deferred_compaction,
 	unsigned long *did_some_progress)
 {
 	struct page *page;
@@ -2106,7 +2117,8 @@
  
 	current->flags |= PF_MEMALLOC;
 	*did_some_progress = try_to_compact_pages(zonelist, order, gfp_mask,
-						nodemask, sync_migration);
+						nodemask, sync_migration,
+						contended_compaction);
 	current->flags &= ~PF_MEMALLOC;
 	if (*did_some_progress != COMPACT_SKIPPED) {
  
@@ -2152,7 +2164,7 @@
 	struct zonelist *zonelist, enum zone_type high_zoneidx,
 	nodemask_t *nodemask, int alloc_flags, struct zone *preferred_zone,
 	int migratetype, bool sync_migration,
-	bool *deferred_compaction,
+	bool *contended_compaction, bool *deferred_compaction,
 	unsigned long *did_some_progress)
 {
 	return NULL;
@@ -2325,6 +2337,7 @@
 	unsigned long did_some_progress;
 	bool sync_migration = false;
 	bool deferred_compaction = false;
+	bool contended_compaction = false;
  
 	/*
 	 * In the slowpath, we sanity check order to avoid ever trying to
@@ -2389,14 +2402,6 @@
 				zonelist, high_zoneidx, nodemask,
 				preferred_zone, migratetype);
 		if (page) {
-			/*
-			 * page->pfmemalloc is set when ALLOC_NO_WATERMARKS was
-			 * necessary to allocate the page. The expectation is
-			 * that the caller is taking steps that will free more
-			 * memory. The caller should avoid the page being used
-			 * for !PFMEMALLOC purposes.
-			 */
-			page->pfmemalloc = true;
 			goto got_pg;
 		}
 	}
@@ -2422,6 +2427,7 @@
 					nodemask,
 					alloc_flags, preferred_zone,
 					migratetype, sync_migration,
+					&contended_compaction,
 					&deferred_compaction,
 					&did_some_progress);
 	if (page)
  
@@ -2431,10 +2437,11 @@
 	/*
 	 * If compaction is deferred for high-order allocations, it is because
 	 * sync compaction recently failed. In this is the case and the caller
-	 * has requested the system not be heavily disrupted, fail the
-	 * allocation now instead of entering direct reclaim
+	 * requested a movable allocation that does not heavily disrupt the
+	 * system then fail the allocation instead of entering direct reclaim.
 	 */
-	if (deferred_compaction && (gfp_mask & __GFP_NO_KSWAPD))
+	if ((deferred_compaction || contended_compaction) &&
+						(gfp_mask & __GFP_NO_KSWAPD))
 		goto nopage;
  
 	/* Try direct reclaim and then allocating */
@@ -2505,6 +2512,7 @@
 					nodemask,
 					alloc_flags, preferred_zone,
 					migratetype, sync_migration,
+					&contended_compaction,
 					&deferred_compaction,
 					&did_some_progress);
 		if (page)
@@ -2569,8 +2577,6 @@
 		page = __alloc_pages_slowpath(gfp_mask, order,
 				zonelist, high_zoneidx, nodemask,
 				preferred_zone, migratetype);
-	else
-		page->pfmemalloc = false;
  
 	trace_mm_page_alloc(page, order, gfp_mask, migratetype);
  
@@ -3016,7 +3016,8 @@
 					$herectx .= raw_line($linenr, $n) . "\n";
 				}
  
-				if (($stmts =~ tr/;/;/) == 1) {
+				if (($stmts =~ tr/;/;/) == 1 &&
+				    $stmts !~ /^\s*(if|while|for|switch)\b/) {
 					WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
 					     "Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
 				}
...	...	@@ -137,6 +137,17 @@
137	137	without doing anything or remount the partition in
138	138	read-only mode (default behavior).
139	139
	140	+discard -- If set, issues discard/TRIM commands to the block
	141	+ device when blocks are freed. This is useful for SSD devices
	142	+ and sparse/thinly-provisoned LUNs.
	143	+
	144	+nfs -- This option maintains an index (cache) of directory
	145	+ inodes by i_logstart which is used by the nfs-related code to
	146	+ improve look-ups.
	147	+
	148	+ Enable this only if you want to export the FAT filesystem
	149	+ over NFS
	150	+
140	151	<bool>: 0,1,yes,no,true,false
141	152
142	153	TODO
...	...	@@ -299,12 +299,18 @@
299	299	*******************************************************************
300	300
301	301	/*
302		- * hugepage-shm: see Documentation/vm/hugepage-shm.c
	302	+ * map_hugetlb: see tools/testing/selftests/vm/map_hugetlb.c
303	303	*/
304	304
305	305	*******************************************************************
306	306
307	307	/*
308		- * hugepage-mmap: see Documentation/vm/hugepage-mmap.c
	308	+ * hugepage-shm: see tools/testing/selftests/vm/hugepage-shm.c
	309	+ */
	310	+
	311	+*******************************************************************
	312	+
	313	+/*
	314	+ * hugepage-mmap: see tools/testing/selftests/vm/hugepage-mmap.c
309	315	*/
...	...	@@ -56,9 +56,16 @@
56	56	}
57	57
58	58	/*
59		- * search for a shareable pmd page for hugetlb.
	59	+ * Search for a shareable pmd page for hugetlb. In any case calls pmd_alloc()
	60	+ * and returns the corresponding pte. While this is not necessary for the
	61	+ * !shared pmd case because we can allocate the pmd later as well, it makes the
	62	+ * code much cleaner. pmd allocation is essential for the shared case because
	63	+ * pud has to be populated inside the same i_mmap_mutex section - otherwise
	64	+ * racing tasks could either miss the sharing (see huge_pte_offset) or select a
	65	+ * bad pmd for sharing.
60	66	*/
61		-static void huge_pmd_share(struct mm_struct mm, unsigned long addr, pud_t pud)
	67	+static pte_t *
	68	+huge_pmd_share(struct mm_struct mm, unsigned long addr, pud_t pud)
62	69	{
63	70	struct vm_area_struct *vma = find_vma(mm, addr);
64	71	struct address_space *mapping = vma->vm_file->f_mapping;
65	72
...	...	@@ -68,9 +75,10 @@
68	75	struct vm_area_struct *svma;
69	76	unsigned long saddr;
70	77	pte_t *spte = NULL;
	78	+ pte_t *pte;
71	79
72	80	if (!vma_shareable(vma, addr))
73		- return;
	81	+ return (pte_t *)pmd_alloc(mm, pud, addr);
74	82
75	83	mutex_lock(&mapping->i_mmap_mutex);
76	84	vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
77	85
...	...	@@ -97,7 +105,9 @@
97	105	put_page(virt_to_page(spte));
98	106	spin_unlock(&mm->page_table_lock);
99	107	out:
	108	+ pte = (pte_t *)pmd_alloc(mm, pud, addr);
100	109	mutex_unlock(&mapping->i_mmap_mutex);
	110	+ return pte;
101	111	}
102	112
103	113	/*
...	...	@@ -142,8 +152,9 @@
142	152	} else {
143	153	BUG_ON(sz != PMD_SIZE);
144	154	if (pud_none(*pud))
145		- huge_pmd_share(mm, addr, pud);
146		- pte = (pte_t *) pmd_alloc(mm, pud, addr);
	155	+ pte = huge_pmd_share(mm, addr, pud);
	156	+ else
	157	+ pte = (pte_t *)pmd_alloc(mm, pud, addr);
147	158	}
148	159	}
149	160	BUG_ON(pte && !pte_none(pte) && !pte_huge(pte));
...	...	@@ -763,16 +763,7 @@
763	763	{
764	764	case CMD_TARGET_STATUS:
765	765	/* Pass it up to the upper layers... */
766		- if( ei->ScsiStatus)
767		- {
768		-#if 0
769		- printk(KERN_WARNING "cciss: cmd %p "
770		- "has SCSI Status = %x\n",
771		- c, ei->ScsiStatus);
772		-#endif
773		- cmd->result \|= (ei->ScsiStatus << 1);
774		- }
775		- else { /* scsi status is zero??? How??? */
	766	+ if (!ei->ScsiStatus) {
776	767
777	768	/* Ordinarily, this case should never happen, but there is a bug
778	769	in some released firmware revisions that allows it to happen
...	...	@@ -53,7 +53,7 @@
53	53	#define MFGPT_PERIODIC (MFGPT_HZ / HZ)
54	54
55	55	/*
56		- * The MFPGT timers on the CS5536 provide us with suitable timers to use
	56	+ * The MFGPT timers on the CS5536 provide us with suitable timers to use
57	57	* as clock event sources - not as good as a HPET or APIC, but certainly
58	58	* better than the PIT. This isn't a general purpose MFGPT driver, but
59	59	* a simplified one designed specifically to act as a clock event source.
...	...	@@ -144,7 +144,7 @@
144	144
145	145	timer = cs5535_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING);
146	146	if (!timer) {
147		- printk(KERN_ERR DRV_NAME ": Could not allocate MFPGT timer\n");
	147	+ printk(KERN_ERR DRV_NAME ": Could not allocate MFGPT timer\n");
148	148	return -ENODEV;
149	149	}
150	150	cs5535_event_clock = timer;
...	...	@@ -18,6 +18,8 @@
18	18	#include <linux/interrupt.h>
19	19	#include <linux/delay.h>
20	20	#include <linux/device.h>
	21	+#include <linux/cpu.h>
	22	+#include <linux/module.h>
21	23	#include <linux/err.h>
22	24	#include <linux/slab.h>
23	25	#include <asm/uv/uv_hub.h>
...	...	@@ -59,6 +61,8 @@
59	61	XPC_NOTIFY_MSG_SIZE_UV)
60	62	#define XPC_NOTIFY_IRQ_NAME "xpc_notify"
61	63
	64	+static int xpc_mq_node = -1;
	65	+
62	66	static struct xpc_gru_mq_uv *xpc_activate_mq_uv;
63	67	static struct xpc_gru_mq_uv *xpc_notify_mq_uv;
64	68
65	69
...	...	@@ -109,11 +113,8 @@
109	113	#if defined CONFIG_X86_64
110	114	mq->irq = uv_setup_irq(irq_name, cpu, mq->mmr_blade, mq->mmr_offset,
111	115	UV_AFFINITY_CPU);
112		- if (mq->irq < 0) {
113		- dev_err(xpc_part, "uv_setup_irq() returned error=%d\n",
114		- -mq->irq);
	116	+ if (mq->irq < 0)
115	117	return mq->irq;
116		- }
117	118
118	119	mq->mmr_value = uv_read_global_mmr64(mmr_pnode, mq->mmr_offset);
119	120
...	...	@@ -238,8 +239,9 @@
238	239	mq->mmr_blade = uv_cpu_to_blade_id(cpu);
239	240
240	241	nid = cpu_to_node(cpu);
241		- page = alloc_pages_exact_node(nid, GFP_KERNEL \| __GFP_ZERO \| GFP_THISNODE,
242		- pg_order);
	242	+ page = alloc_pages_exact_node(nid,
	243	+ GFP_KERNEL \| __GFP_ZERO \| GFP_THISNODE,
	244	+ pg_order);
243	245	if (page == NULL) {
244	246	dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d "
245	247	"bytes of memory on nid=%d for GRU mq\n", mq_size, nid);
246	248
...	...	@@ -1731,9 +1733,50 @@
1731	1733	.notify_senders_of_disconnect = xpc_notify_senders_of_disconnect_uv,
1732	1734	};
1733	1735
	1736	+static int
	1737	+xpc_init_mq_node(int nid)
	1738	+{
	1739	+ int cpu;
	1740	+
	1741	+ get_online_cpus();
	1742	+
	1743	+ for_each_cpu(cpu, cpumask_of_node(nid)) {
	1744	+ xpc_activate_mq_uv =
	1745	+ xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, nid,
	1746	+ XPC_ACTIVATE_IRQ_NAME,
	1747	+ xpc_handle_activate_IRQ_uv);
	1748	+ if (!IS_ERR(xpc_activate_mq_uv))
	1749	+ break;
	1750	+ }
	1751	+ if (IS_ERR(xpc_activate_mq_uv)) {
	1752	+ put_online_cpus();
	1753	+ return PTR_ERR(xpc_activate_mq_uv);
	1754	+ }
	1755	+
	1756	+ for_each_cpu(cpu, cpumask_of_node(nid)) {
	1757	+ xpc_notify_mq_uv =
	1758	+ xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, nid,
	1759	+ XPC_NOTIFY_IRQ_NAME,
	1760	+ xpc_handle_notify_IRQ_uv);
	1761	+ if (!IS_ERR(xpc_notify_mq_uv))
	1762	+ break;
	1763	+ }
	1764	+ if (IS_ERR(xpc_notify_mq_uv)) {
	1765	+ xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
	1766	+ put_online_cpus();
	1767	+ return PTR_ERR(xpc_notify_mq_uv);
	1768	+ }
	1769	+
	1770	+ put_online_cpus();
	1771	+ return 0;
	1772	+}
	1773	+
1734	1774	int
1735	1775	xpc_init_uv(void)
1736	1776	{
	1777	+ int nid;
	1778	+ int ret = 0;
	1779	+
1737	1780	xpc_arch_ops = xpc_arch_ops_uv;
1738	1781
1739	1782	if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
1740	1783
1741	1784
...	...	@@ -1742,21 +1785,21 @@
1742	1785	return -E2BIG;
1743	1786	}
1744	1787
1745		- xpc_activate_mq_uv = xpc_create_gru_mq_uv(XPC_ACTIVATE_MQ_SIZE_UV, 0,
1746		- XPC_ACTIVATE_IRQ_NAME,
1747		- xpc_handle_activate_IRQ_uv);
1748		- if (IS_ERR(xpc_activate_mq_uv))
1749		- return PTR_ERR(xpc_activate_mq_uv);
	1788	+ if (xpc_mq_node < 0)
	1789	+ for_each_online_node(nid) {
	1790	+ ret = xpc_init_mq_node(nid);
1750	1791
1751		- xpc_notify_mq_uv = xpc_create_gru_mq_uv(XPC_NOTIFY_MQ_SIZE_UV, 0,
1752		- XPC_NOTIFY_IRQ_NAME,
1753		- xpc_handle_notify_IRQ_uv);
1754		- if (IS_ERR(xpc_notify_mq_uv)) {
1755		- xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
1756		- return PTR_ERR(xpc_notify_mq_uv);
1757		- }
	1792	+ if (!ret)
	1793	+ break;
	1794	+ }
	1795	+ else
	1796	+ ret = xpc_init_mq_node(xpc_mq_node);
1758	1797
1759		- return 0;
	1798	+ if (ret < 0)
	1799	+ dev_err(xpc_part, "xpc_init_mq_node() returned error=%d\n",
	1800	+ -ret);
	1801	+
	1802	+ return ret;
1760	1803	}
1761	1804
1762	1805	void
...	...	@@ -1765,4 +1808,7 @@
1765	1808	xpc_destroy_gru_mq_uv(xpc_notify_mq_uv);
1766	1809	xpc_destroy_gru_mq_uv(xpc_activate_mq_uv);
1767	1810	}
	1811	+
	1812	+module_param(xpc_mq_node, int, 0);
	1813	+MODULE_PARM_DESC(xpc_mq_node, "Node number on which to allocate message queues.");
...	...	@@ -435,6 +435,9 @@
435	435	" info %4.4x\n", DBELL_SID(idb.bytes),
436	436	DBELL_TID(idb.bytes), DBELL_INF(idb.bytes));
437	437	}
	438	+
	439	+ wr_ptr = ioread32(priv->regs +
	440	+ TSI721_IDQ_WP(IDB_QUEUE)) % IDB_QSIZE;
438	441	}
439	442
440	443	iowrite32(rd_ptr & (IDB_QSIZE - 1),
...	...	@@ -445,6 +448,10 @@
445	448	regval \|= TSI721_SR_CHINT_IDBQRCV;
446	449	iowrite32(regval,
447	450	priv->regs + TSI721_SR_CHINTE(IDB_QUEUE));
	451	+
	452	+ wr_ptr = ioread32(priv->regs + TSI721_IDQ_WP(IDB_QUEUE)) % IDB_QSIZE;
	453	+ if (wr_ptr != rd_ptr)
	454	+ schedule_work(&priv->idb_work);
448	455	}
449	456
450	457	/**
...	...	@@ -2212,7 +2219,7 @@
2212	2219	const struct pci_device_id *id)
2213	2220	{
2214	2221	struct tsi721_device *priv;
2215		- int i, cap;
	2222	+ int cap;
2216	2223	int err;
2217	2224	u32 regval;
2218	2225
2219	2226
...	...	@@ -2232,11 +2239,14 @@
2232	2239	priv->pdev = pdev;
2233	2240
2234	2241	#ifdef DEBUG
	2242	+ {
	2243	+ int i;
2235	2244	for (i = 0; i <= PCI_STD_RESOURCE_END; i++) {
2236	2245	dev_dbg(&pdev->dev, "res[%d] @ 0x%llx (0x%lx, 0x%lx)\n",
2237	2246	i, (unsigned long long)pci_resource_start(pdev, i),
2238	2247	(unsigned long)pci_resource_len(pdev, i),
2239	2248	pci_resource_flags(pdev, i));
	2249	+ }
2240	2250	}
2241	2251	#endif
2242	2252	/*
...	...	@@ -43,6 +43,7 @@
43	43	#include <linux/rtc.h>
44	44	#include <linux/spi/spi.h>
45	45	#include <linux/module.h>
	46	+#include <linux/sysfs.h>
46	47
47	48	#define DRV_VERSION "0.6"
48	49
...	...	@@ -292,6 +293,7 @@
292	293	pdata->rtc = rtc;
293	294
294	295	for (i = 0; i < 16; i++) {
	296	+ sysfs_attr_init(&pdata->regs[i].attr.attr);
295	297	sprintf(pdata->regs[i].name, "%1x", i);
296	298	pdata->regs[i].attr.attr.mode = S_IRUGO \| S_IWUSR;
297	299	pdata->regs[i].attr.attr.name = pdata->regs[i].name;
...	...	@@ -122,9 +122,12 @@
122	122	tm->tm_min = bcd2bin(rxbuf[RS5C348_REG_MINS] & RS5C348_MINS_MASK);
123	123	tm->tm_hour = bcd2bin(rxbuf[RS5C348_REG_HOURS] & RS5C348_HOURS_MASK);
124	124	if (!pdata->rtc_24h) {
125		- tm->tm_hour %= 12;
126		- if (rxbuf[RS5C348_REG_HOURS] & RS5C348_BIT_PM)
	125	+ if (rxbuf[RS5C348_REG_HOURS] & RS5C348_BIT_PM) {
	126	+ tm->tm_hour -= 20;
	127	+ tm->tm_hour %= 12;
127	128	tm->tm_hour += 12;
	129	+ } else
	130	+ tm->tm_hour %= 12;
128	131	}
129	132	tm->tm_wday = bcd2bin(rxbuf[RS5C348_REG_WDAY] & RS5C348_WDAY_MASK);
130	133	tm->tm_mday = bcd2bin(rxbuf[RS5C348_REG_DAY] & RS5C348_DAY_MASK);
...	...	@@ -22,7 +22,7 @@
22	22	extern int fragmentation_index(struct zone *zone, unsigned int order);
23	23	extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
24	24	int order, gfp_t gfp_mask, nodemask_t *mask,
25		- bool sync);
	25	+ bool sync, bool *contended);
26	26	extern int compact_pgdat(pg_data_t *pgdat, int order);
27	27	extern unsigned long compaction_suitable(struct zone *zone, int order);
28	28
...	...	@@ -64,7 +64,7 @@
64	64	#else
65	65	static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,
66	66	int order, gfp_t gfp_mask, nodemask_t *nodemask,
67		- bool sync)
	67	+ bool sync, bool *contended)
68	68	{
69	69	return COMPACT_CONTINUE;
70	70	}