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

Commit 8816ead9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'perf-urgent-for-linus', 'sched-urgent-for-linus',... 

Merge branches 'perf-urgent-for-linus', 'sched-urgent-for-linus', 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  tools/perf: Fix static build of perf tool
  tracing: Fix regression in printk_formats file

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  generic-ipi: Fix kexec boot crash by initializing call_single_queue before enabling interrupts

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: Make watchdog robust vs. interruption
  timerfd: Fix wakeup of processes when timer is cancelled on clock change

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, MAINTAINERS: Add x86 MCE people
  x86, efi: Do not reserve boot services regions within reserved areas
parents 357ed6b1 203db295 d8ad7d11 b5199515 c1f5c54b

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -7007,6 +7007,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. 
S:	Maintained

F:	drivers/platform/x86



X86 MCE INFRASTRUCTURE

M:	Tony Luck <tony.luck@intel.com>

M:	Borislav Petkov <bp@amd64.org>

L:	linux-edac@vger.kernel.org

S:	Maintained

F:	arch/x86/kernel/cpu/mcheck/*



XEN HYPERVISOR INTERFACE

M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

arch/x86/include/asm/memblock.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#define ARCH_DISCARD_MEMBLOCK



u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align);

void memblock_x86_to_bootmem(u64 start, u64 end);



void memblock_x86_reserve_range(u64 start, u64 end, char *name);

void memblock_x86_free_range(u64 start, u64 end);
@@ -19,5 +18,6 @@ u64 memblock_x86_hole_size(u64 start, u64 end); 
u64 memblock_x86_find_in_range_node(int nid, u64 start, u64 end, u64 size, u64 align);

u64 memblock_x86_free_memory_in_range(u64 addr, u64 limit);

u64 memblock_x86_memory_in_range(u64 addr, u64 limit);

bool memblock_x86_check_reserved_size(u64 *addrp, u64 *sizep, u64 align);



#endif

arch/x86/mm/memblock.c

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include <linux/range.h>



/* Check for already reserved areas */

static bool __init check_with_memblock_reserved_size(u64 *addrp, u64 *sizep, u64 align)

bool __init memblock_x86_check_reserved_size(u64 *addrp, u64 *sizep, u64 align)

{

	struct memblock_region *r;

	u64 addr = *addrp, last;
@@ -59,7 +59,7 @@ u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align) 
		if (addr >= ei_last)

			continue;

		*sizep = ei_last - addr;

		while (check_with_memblock_reserved_size(&addr, sizep, align))

		while (memblock_x86_check_reserved_size(&addr, sizep, align))

			;



		if (*sizep)

arch/x86/platform/efi/efi.c

+25 −4
Original line number Diff line number Diff line
@@ -310,14 +310,31 @@ void __init efi_reserve_boot_services(void) 


	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {

		efi_memory_desc_t *md = p;

		unsigned long long start = md->phys_addr;

		unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;

		u64 start = md->phys_addr;

		u64 size = md->num_pages << EFI_PAGE_SHIFT;



		if (md->type != EFI_BOOT_SERVICES_CODE &&

		    md->type != EFI_BOOT_SERVICES_DATA)

			continue;



		memblock_x86_reserve_range(start, start + size, "EFI Boot");

		/* Only reserve where possible:

		 * - Not within any already allocated areas

		 * - Not over any memory area (really needed, if above?)

		 * - Not within any part of the kernel

		 * - Not the bios reserved area

		*/

		if ((start+size >= virt_to_phys(_text)

				&& start <= virt_to_phys(_end)) ||

			!e820_all_mapped(start, start+size, E820_RAM) ||

			memblock_x86_check_reserved_size(&start, &size,

							1<<EFI_PAGE_SHIFT)) {

			/* Could not reserve, skip it */

			md->num_pages = 0;

			memblock_dbg(PFX "Could not reserve boot range "

					"[0x%010llx-0x%010llx]\n",

						start, start+size-1);

		} else

			memblock_x86_reserve_range(start, start+size,

							"EFI Boot");

	}

}
@@ -334,6 +351,10 @@ static void __init efi_free_boot_services(void) 
		    md->type != EFI_BOOT_SERVICES_DATA)

			continue;



		/* Could not reserve boot area */

		if (!size)

			continue;



		free_bootmem_late(start, size);

	}

}

fs/timerfd.c

+4 −1
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ static enum hrtimer_restart timerfd_tmrproc(struct hrtimer *htmr) 


/*

 * Called when the clock was set to cancel the timers in the cancel

 * list.

 * list. This will wake up processes waiting on these timers. The

 * wake-up requires ctx->ticks to be non zero, therefore we increment

 * it before calling wake_up_locked().

 */

void timerfd_clock_was_set(void)

{
@@ -76,6 +78,7 @@ void timerfd_clock_was_set(void) 
		spin_lock_irqsave(&ctx->wqh.lock, flags);

		if (ctx->moffs.tv64 != moffs.tv64) {

			ctx->moffs.tv64 = KTIME_MAX;

			ctx->ticks++;

			wake_up_locked(&ctx->wqh);

		}

		spin_unlock_irqrestore(&ctx->wqh.lock, flags);