From 6a70082c469bc9a564fe730c5d1b0297d4e05541 Mon Sep 17 00:00:00 2001
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Thu, 1 Jun 2006 01:00:39 +0900
Subject: [PATCH] --- yaml --- r: 27135 b: refs/heads/master c:
 460c0422c3861ab63a14c2be600a96a9e68b89f2 h: refs/heads/master i:   27133:
 59ef45be9faf7eb7641416c3117ac4dd76e06db4   27131:
 1a5f66600cafdf590422119e32fc760d2ae9a152   27127:
 22b087de7160caec009a1e1807c56c4132058936   27119:
 cb876f26e379e91576deb9e688189951800efebe   27103:
 7e9d15ea5a2094c16704da0b3da3ed2c53e4d2c1   27071:
 b75924c10af3087a63f514a2cc5ddbabb6282693   27007:
 0e05105948325b7b5993293d09ef9588e4bd6aa3   26879:
 7ba7acba1bdeb4c94b7ac029bc3eb65fe3d94cf0   26623:
 944cb629fbf5931edec5b916c13733c72d9bda63 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/mips/kernel/cpu-bugs64.c | 8 ++++----
 trunk/arch/mips/kernel/setup.c      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 96f40249ceb6..e8226d2592d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32b699335b70fae94ce041c9a1c6d3a31a3f7e4
+refs/heads/master: 460c0422c3861ab63a14c2be600a96a9e68b89f2
diff --git a/trunk/arch/mips/kernel/cpu-bugs64.c b/trunk/arch/mips/kernel/cpu-bugs64.c
index 47a087b6c11b..d268827c62bd 100644
--- a/trunk/arch/mips/kernel/cpu-bugs64.c
+++ b/trunk/arch/mips/kernel/cpu-bugs64.c
@@ -206,7 +206,7 @@ static inline void check_daddi(void)
 		"daddi	%0, %1, %3\n\t"
 		".set	pop"
 		: "=r" (v), "=&r" (tmp)
-		: "I" (0xffffffffffffdb9a), "I" (0x1234));
+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));
 	set_except_vector(12, handler);
 	local_irq_restore(flags);
 
@@ -224,7 +224,7 @@ static inline void check_daddi(void)
 		"dsrl	%1, %1, 1\n\t"
 		"daddi	%0, %1, %3"
 		: "=r" (v), "=&r" (tmp)
-		: "I" (0xffffffffffffdb9a), "I" (0x1234));
+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));
 	set_except_vector(12, handler);
 	local_irq_restore(flags);
 
@@ -280,7 +280,7 @@ static inline void check_daddiu(void)
 		"daddu	%1, %2\n\t"
 		".set	pop"
 		: "=&r" (v), "=&r" (w), "=&r" (tmp)
-		: "I" (0xffffffffffffdb9a), "I" (0x1234));
+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));
 
 	if (v == w) {
 		printk("no.\n");
@@ -296,7 +296,7 @@ static inline void check_daddiu(void)
 		"addiu	%1, $0, %4\n\t"
 		"daddu	%1, %2"
 		: "=&r" (v), "=&r" (w), "=&r" (tmp)
-		: "I" (0xffffffffffffdb9a), "I" (0x1234));
+		: "I" (0xffffffffffffdb9aUL), "I" (0x1234));
 
 	if (v == w) {
 		printk("yes.\n");
diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c
index bcf1b10e518f..faeed5f4cf26 100644
--- a/trunk/arch/mips/kernel/setup.c
+++ b/trunk/arch/mips/kernel/setup.c
@@ -246,7 +246,7 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en
 #ifdef CONFIG_64BIT
 	/* HACK: Guess if the sign extension was forgotten */
 	if (start > 0x0000000080000000 && start < 0x00000000ffffffff)
-		start |= 0xffffffff00000000;
+		start |= 0xffffffff00000000UL;
 #endif
 
 	end = start + size;