From 18e750dda16a749bad2c0f74b254344a21d52980 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Mon, 24 May 2010 14:32:46 -0700 Subject: [PATCH] --- yaml --- r: 198264 b: refs/heads/master c: ff3d58c22b6827039983911d3460cf0c1657f8cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/highmem.h | 2 +- trunk/mm/highmem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9b6f3a9e6eb..083e7fdc5007 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd23855e38d2a7275a786238459c070b4e9f7975 +refs/heads/master: ff3d58c22b6827039983911d3460cf0c1657f8cc diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h index 74152c08ad07..caafd0561aa1 100644 --- a/trunk/include/linux/highmem.h +++ b/trunk/include/linux/highmem.h @@ -27,7 +27,7 @@ static inline void invalidate_kernel_vmap_range(void *vaddr, int size) #include -#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT) +#ifdef CONFIG_DEBUG_HIGHMEM void debug_kmap_atomic(enum km_type type); diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c index bed8a8bfd01f..66baa20f78f5 100644 --- a/trunk/mm/highmem.c +++ b/trunk/mm/highmem.c @@ -422,7 +422,7 @@ void __init page_address_init(void) #endif /* defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL) */ -#if defined(CONFIG_DEBUG_HIGHMEM) && defined(CONFIG_TRACE_IRQFLAGS_SUPPORT) +#ifdef CONFIG_DEBUG_HIGHMEM void debug_kmap_atomic(enum km_type type) {