- x86-convert-highmem-macros-to-functions.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     x86: convert highmem macros to functions
has been removed from the -mm tree.  Its filename was
     x86-convert-highmem-macros-to-functions.patch

This patch was dropped because other changes were merged, which wrecked this patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: x86: convert highmem macros to functions
From: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>

convert kmap_init, permanent_kmaps_init, set_highmem_pages_init macros
defined when !CONFIG_HIGHMEM to functions

supresses following warning from gcc:
arch/x86/mm/init_32.c: In function 'pagetable_init':
arch/x86/mm/init_32.c:516: warning: unused variable 'pgd_base'

Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 arch/x86/mm/init_32.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN arch/x86/mm/init_32.c~x86-convert-highmem-macros-to-functions arch/x86/mm/init_32.c
--- a/arch/x86/mm/init_32.c~x86-convert-highmem-macros-to-functions
+++ a/arch/x86/mm/init_32.c
@@ -436,9 +436,9 @@ static void __init set_highmem_pages_ini
 #endif /* !CONFIG_NUMA */
 
 #else
-# define kmap_init()				do { } while (0)
-# define permanent_kmaps_init(pgd_base)		do { } while (0)
-# define set_highmem_pages_init()	do { } while (0)
+static inline void kmap_init(void) {}
+static inline void permanent_kmaps_init(pgd_t *pgd_base) {}
+static inline void set_highmem_pages_init(void) {}
 #endif /* CONFIG_HIGHMEM */
 
 void __init native_pagetable_setup_start(pgd_t *base)
_

Patches currently in -mm which might be from marcin.slusarz@xxxxxxxxx are

origin.patch
x86-convert-highmem-macros-to-functions.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux