Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ae0cdd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f5ba0cf3 fe086a7b

arch/ia64/kernel/smpboot.c

+9 −3
Original line number Diff line number Diff line
@@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c) 
	u16 pltid;

	pal_logical_to_physical_t info;



	if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) {

	status = ia64_pal_logical_to_phys(-1, &info);

	if (status != PAL_STATUS_SUCCESS) {

		if (status != PAL_STATUS_UNIMPLEMENTED) {

			printk(KERN_ERR

				"ia64_pal_logical_to_phys failed with %ld\n",
@@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c) 
		info.overview_cpp  = 1;

		info.overview_tpc  = 1;

	}

	if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) {

		printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status);



	status = ia64_sal_physical_id_info(&pltid);

	if (status != PAL_STATUS_SUCCESS) {

		if (status != PAL_STATUS_UNIMPLEMENTED)

			printk(KERN_ERR

				"ia64_sal_pltid failed with %ld\n",

				status);

		return;

	}

arch/ia64/kernel/topology.c

+9 −0
Original line number Diff line number Diff line
@@ -27,6 +27,15 @@ 


static struct ia64_cpu *sysfs_cpus;



void arch_fix_phys_package_id(int num, u32 slot)

{

#ifdef CONFIG_SMP

	if (cpu_data(num)->socket_id == -1)

		cpu_data(num)->socket_id = slot;

#endif

}

EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);



int arch_register_cpu(int num)

{

#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)

arch/ia64/kernel/uncached.c

+13 −10
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2001-2006 Silicon Graphics, Inc.  All rights reserved.

 * Copyright (C) 2001-2008 Silicon Graphics, Inc.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License
@@ -177,12 +177,13 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid) 
 * uncached_alloc_page

 *

 * @starting_nid: node id of node to start with, or -1

 * @n_pages: number of contiguous pages to allocate

 *

 * Allocate 1 uncached page. Allocates on the requested node. If no

 * uncached pages are available on the requested node, roundrobin starting

 * with the next higher node.

 * Allocate the specified number of contiguous uncached pages on the

 * the requested node. If not enough contiguous uncached pages are available

 * on the requested node, roundrobin starting with the next higher node.

 */

unsigned long uncached_alloc_page(int starting_nid)

unsigned long uncached_alloc_page(int starting_nid, int n_pages)

{

	unsigned long uc_addr;

	struct uncached_pool *uc_pool;
@@ -202,7 +203,8 @@ unsigned long uncached_alloc_page(int starting_nid) 
		if (uc_pool->pool == NULL)

			continue;

		do {

			uc_addr = gen_pool_alloc(uc_pool->pool, PAGE_SIZE);

			uc_addr = gen_pool_alloc(uc_pool->pool,

						 n_pages * PAGE_SIZE);

			if (uc_addr != 0)

				return uc_addr;

		} while (uncached_add_chunk(uc_pool, nid) == 0);
@@ -217,11 +219,12 @@ EXPORT_SYMBOL(uncached_alloc_page); 
/*

 * uncached_free_page

 *

 * @uc_addr: uncached address of page to free

 * @uc_addr: uncached address of first page to free

 * @n_pages: number of contiguous pages to free

 *

 * Free a single uncached page.

 * Free the specified number of uncached pages.

 */

void uncached_free_page(unsigned long uc_addr)

void uncached_free_page(unsigned long uc_addr, int n_pages)

{

	int nid = paddr_to_nid(uc_addr - __IA64_UNCACHED_OFFSET);

	struct gen_pool *pool = uncached_pools[nid].pool;
@@ -232,7 +235,7 @@ void uncached_free_page(unsigned long uc_addr) 
	if ((uc_addr & (0XFUL << 60)) != __IA64_UNCACHED_OFFSET)

		panic("uncached_free_page invalid address %lx\n", uc_addr);



	gen_pool_free(pool, uc_addr, PAGE_SIZE);

	gen_pool_free(pool, uc_addr, n_pages * PAGE_SIZE);

}

EXPORT_SYMBOL(uncached_free_page);

arch/ia64/mm/tlb.c

+4 −1
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ setup_ptcg_sem(int max_purges, int nptcg_from) 
	static int firstcpu = 1;



	if (toolatetochangeptcgsem) {

		if (nptcg_from == NPTCG_FROM_PAL && max_purges == 0)

			BUG_ON(1 < nptcg);

		else

			BUG_ON(max_purges < nptcg);

		return;

	}

drivers/acpi/processor_core.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

}