Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Provide ACPI fixup for /proc/cpuinfo/physical_id
  [IA64] Remove printk noise on unimplemented SAL_PHYSICAL_ID_INFO
  [IA64] allocate multiple contiguous pages via uncached allocator
  [IA64] bugfix: nptcg breaks cpu-hotadd

3 files changed, 17 insertions, 8 deletions

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index dd28c912e84f..5241e3ff5080 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -603,6 +603,15 @@ static int acpi_processor_get_info(struct acpi_processor *pr, unsigned has_uid)
                 request_region(pr->throttling.address, 6, "ACPI CPU throttle");
         }
 
+        /*
+         * If ACPI describes a slot number for this CPU, we can use it
+         * ensure we get the right value in the "physical id" field
+         * of /proc/cpuinfo
+         */
+        status = acpi_evaluate_object(pr->handle, "_SUN", NULL, &buffer);
+        if (ACPI_SUCCESS(status))
+                arch_fix_phys_package_id(pr->id, object.integer.value);
+
         return 0;
 }
 
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index ff146c2b08fd..fe2a95b5d3c0 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -180,7 +180,7 @@ mspec_close(struct vm_area_struct *vma)
                 my_page = vdata->maddr[index];
                 vdata->maddr[index] = 0;
                 if (!mspec_zero_block(my_page, PAGE_SIZE))
-                        uncached_free_page(my_page);
+                        uncached_free_page(my_page, 1);
                 else
                         printk(KERN_WARNING "mspec_close(): "
                                "failed to zero page %ld\n", my_page);
@@ -209,7 +209,7 @@ mspec_nopfn(struct vm_area_struct *vma, unsigned long address)
         index = (address - vdata->vm_start) >> PAGE_SHIFT;
         maddr = (volatile unsigned long) vdata->maddr[index];
         if (maddr == 0) {
-                maddr = uncached_alloc_page(numa_node_id());
+                maddr = uncached_alloc_page(numa_node_id(), 1);
                 if (maddr == 0)
                         return NOPFN_OOM;
 
@@ -218,7 +218,7 @@ mspec_nopfn(struct vm_area_struct *vma, unsigned long address)
                         vdata->count++;
                         vdata->maddr[index] = maddr;
                 } else {
-                        uncached_free_page(maddr);
+                        uncached_free_page(maddr, 1);
                         maddr = vdata->maddr[index];
                 }
                 spin_unlock(&vdata->lock);
@@ -367,7 +367,7 @@ mspec_init(void)
                                 int nasid;
                                 unsigned long phys;
 
-                                scratch_page[nid] = uncached_alloc_page(nid);
+                                scratch_page[nid] = uncached_alloc_page(nid, 1);
                                 if (scratch_page[nid] == 0)
                                         goto free_scratch_pages;
                                 phys = __pa(scratch_page[nid]);
@@ -414,7 +414,7 @@ mspec_init(void)
  free_scratch_pages:
         for_each_node(nid) {
                 if (scratch_page[nid] != 0)
-                        uncached_free_page(scratch_page[nid]);
+                        uncached_free_page(scratch_page[nid], 1);
         }
         return ret;
 }
@@ -431,7 +431,7 @@ mspec_exit(void)
 
                 for_each_node(nid) {
                         if (scratch_page[nid] != 0)
-                                uncached_free_page(scratch_page[nid]);
+                                uncached_free_page(scratch_page[nid], 1);
                 }
         }
 }
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c
index 27e200ec5826..acd3fd4285d7 100644
--- a/drivers/misc/sgi-xp/xpc_partition.c
+++ b/drivers/misc/sgi-xp/xpc_partition.c
@@ -211,7 +211,7 @@ xpc_rsvd_page_init(void)
          */
         amos_page = xpc_vars->amos_page;
         if (amos_page == NULL) {
-                amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0));
+                amos_page = (AMO_t *)TO_AMO(uncached_alloc_page(0, 1));
                 if (amos_page == NULL) {
                         dev_err(xpc_part, "can't allocate page of AMOs\n");
                         return NULL;
@@ -230,7 +230,7 @@ xpc_rsvd_page_init(void)
                                 dev_err(xpc_part, "can't change memory "
                                         "protections\n");
                                 uncached_free_page(__IA64_UNCACHED_OFFSET |
-                                                   TO_PHYS((u64)amos_page));
+                                                   TO_PHYS((u64)amos_page), 1);
                                 return NULL;
                         }
                 }