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

Commit 7a837d1b authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

perf, x86: Fix up kmap_atomic() type 



Now that the KM_type stuff is history, clean up the compiler warning.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Miller <davem@davemloft.net>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ece0e2b6

arch/x86/kernel/cpu/perf_event.c

+2 −3
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ static unsigned long 
copy_from_user_nmi(void *to, const void __user *from, unsigned long n)

{

	unsigned long offset, addr = (unsigned long)from;

	int type = in_nmi() ? KM_NMI : KM_IRQ0;

	unsigned long size, len = 0;

	struct page *page;

	void *map;
@@ -63,9 +62,9 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n) 
		offset = addr & (PAGE_SIZE - 1);

		size = min(PAGE_SIZE - offset, n - len);



		map = kmap_atomic(page, type);

		map = kmap_atomic(page);

		memcpy(to, map+offset, size);

		kunmap_atomic(map, type);

		kunmap_atomic(map);

		put_page(page);



		len  += size;