From a03c08671b8918be211d479c00d8d894acfceb38 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 30 Jan 2008 13:31:17 +0100
Subject: [PATCH] --- yaml --- r: 79988 b: refs/heads/master c:
 1e160cc3f3b5c38bba79c58172e82c1e24934546 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/asm-x86/msr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2276225ac61d..095fa85b8ee5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 341d8854d38fe6e7655f7748babae5c25a51aa70
+refs/heads/master: 1e160cc3f3b5c38bba79c58172e82c1e24934546
diff --git a/trunk/include/asm-x86/msr.h b/trunk/include/asm-x86/msr.h
index 040d3910d891..088652a62d58 100644
--- a/trunk/include/asm-x86/msr.h
+++ b/trunk/include/asm-x86/msr.h
@@ -13,7 +13,7 @@
 #include <asm/asm.h>
 #include <asm/errno.h>
 
-static inline unsigned long long native_read_tscp(int *aux)
+static inline unsigned long long native_read_tscp(unsigned int *aux)
 {
 	unsigned long low, high;
 	asm volatile (".byte 0x0f,0x01,0xf9"