From a7bd890e666c93d68652f69a5dd2232493c75cc7 Mon Sep 17 00:00:00 2001
From: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
Date: Mon, 29 Apr 2013 15:07:40 -0700
Subject: [PATCH] --- yaml --- r: 365407 b: refs/heads/master c:
 13ba3fcbbe31068b1ee7c39a0b58ecbed03c4d72 h: refs/heads/master i:   365405:
 969cdf2682dc1f67a5b931a20416bd46e73f717c   365403:
 5829b8c28e37382723b12e9a4ff66a1982cb8b99   365399:
 b35276d18874f381f75c51bc5de562a26de20f55   365391:
 408b4cb1285c19ce4370e2ecbfdfe0bcbefb4bc6   365375:
 bea7671e0bdef63c28ca4687043d670e224733ec v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/vmalloc.h | 13 +++++++++++++
 trunk/kernel/kexec.c          |  3 ++-
 trunk/mm/vmalloc.c            | 11 -----------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index eeaff2e9a531..30ca8e645b42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4341fa454796b8a37efd5db98112524e85e7114e
+refs/heads/master: 13ba3fcbbe31068b1ee7c39a0b58ecbed03c4d72
diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h
index 8a25f9081ed0..7d5773a99f20 100644
--- a/trunk/include/linux/vmalloc.h
+++ b/trunk/include/linux/vmalloc.h
@@ -3,7 +3,9 @@
 
 #include <linux/spinlock.h>
 #include <linux/init.h>
+#include <linux/list.h>
 #include <asm/page.h>		/* pgprot_t */
+#include <linux/rbtree.h>
 
 struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
 
@@ -35,6 +37,17 @@ struct vm_struct {
 	const void		*caller;
 };
 
+struct vmap_area {
+	unsigned long va_start;
+	unsigned long va_end;
+	unsigned long flags;
+	struct rb_node rb_node;         /* address sorted rbtree */
+	struct list_head list;          /* address sorted list */
+	struct list_head purge_list;    /* "lazy purge" list */
+	struct vm_struct *vm;
+	struct rcu_head rcu_head;
+};
+
 /*
  *	Highlevel APIs for driver use
  */
diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c
index 0b1f7e780d46..b574920cbd4b 100644
--- a/trunk/kernel/kexec.c
+++ b/trunk/kernel/kexec.c
@@ -1615,7 +1615,8 @@ static int __init crash_save_vmcoreinfo_init(void)
 	VMCOREINFO_OFFSET(free_area, free_list);
 	VMCOREINFO_OFFSET(list_head, next);
 	VMCOREINFO_OFFSET(list_head, prev);
-	VMCOREINFO_OFFSET(vm_struct, addr);
+	VMCOREINFO_OFFSET(vmap_area, va_start);
+	VMCOREINFO_OFFSET(vmap_area, list);
 	VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER);
 	log_buf_kexec_setup();
 	VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES);
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 151da8ac53fa..72043d6c88c0 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -249,17 +249,6 @@ EXPORT_SYMBOL(vmalloc_to_pfn);
 #define VM_LAZY_FREEING	0x02
 #define VM_VM_AREA	0x04
 
-struct vmap_area {
-	unsigned long va_start;
-	unsigned long va_end;
-	unsigned long flags;
-	struct rb_node rb_node;		/* address sorted rbtree */
-	struct list_head list;		/* address sorted list */
-	struct list_head purge_list;	/* "lazy purge" list */
-	struct vm_struct *vm;
-	struct rcu_head rcu_head;
-};
-
 static DEFINE_SPINLOCK(vmap_area_lock);
 /* Export for kexec only */
 LIST_HEAD(vmap_area_list);