Auto merge with /home/aegl/GIT/linus

diff --git a/arch/ia64/kernel/entry.h b/arch/ia64/kernel/entry.h
index 6d4ecec989b5803c94ba72bd13566575b563ee4a..78eeb079341981da72e1815df0132ef3944a6209 100644 (file)
--- a/arch/ia64/kernel/entry.h
+++ b/arch/ia64/kernel/entry.h
@@ -60,7 +60,7 @@
        .spillsp @priunat,SW(AR_UNAT)+16+(off);                                 \
        .spillsp ar.rnat,SW(AR_RNAT)+16+(off);                                  \
        .spillsp ar.bspstore,SW(AR_BSPSTORE)+16+(off);                          \
-       .spillsp pr,SW(PR)+16+(off))
+       .spillsp pr,SW(PR)+16+(off)
 
 #define DO_SAVE_SWITCH_STACK                   \
        movl r28=1f;                            \

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 047e7222df7a70caa441a6a8455472d64c2727b4..73781ec165b40a96e92f98c6701daa27393ea3f3 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,7 +315,7 @@ extern struct efi_memory_map memmap;
  */
 static inline int efi_range_is_wc(unsigned long start, unsigned long len)
 {
-       int i;
+       unsigned long i;
 
        for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) {
                unsigned long paddr = __pa(start + i);