From: "tip-bot for H. Peter Anvin" <hpa@linux.intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
dave@linux.vnet.ibm.com, stable@vger.kernel.org,
tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/mm] x86-32, mm: Remove reference to resume_map_numa_kva( )
Date: Thu, 31 Jan 2013 14:40:29 -0800 [thread overview]
Message-ID: <tip-bb112aec5ee41427e9b9726e3d57b896709598ed@git.kernel.org> (raw)
In-Reply-To: <20130131005616.1C79F411@kernel.stglabs.ibm.com>
Commit-ID: bb112aec5ee41427e9b9726e3d57b896709598ed
Gitweb: http://git.kernel.org/tip/bb112aec5ee41427e9b9726e3d57b896709598ed
Author: H. Peter Anvin <hpa@linux.intel.com>
AuthorDate: Thu, 31 Jan 2013 13:53:10 -0800
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 31 Jan 2013 14:12:30 -0800
x86-32, mm: Remove reference to resume_map_numa_kva()
Remove reference to removed function resume_map_numa_kva().
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/20130131005616.1C79F411@kernel.stglabs.ibm.com
---
arch/x86/include/asm/mmzone_32.h | 6 ------
arch/x86/power/hibernate_32.c | 2 --
2 files changed, 8 deletions(-)
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index eb05fb3..8a9b3e2 100644
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[];
#include <asm/numaq.h>
-extern void resume_map_numa_kva(pgd_t *pgd);
-
-#else /* !CONFIG_NUMA */
-
-static inline void resume_map_numa_kva(pgd_t *pgd) {}
-
#endif /* CONFIG_NUMA */
#ifdef CONFIG_DISCONTIGMEM
diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c
index 74202c1..7d28c88 100644
--- a/arch/x86/power/hibernate_32.c
+++ b/arch/x86/power/hibernate_32.c
@@ -129,8 +129,6 @@ static int resume_physical_mapping_init(pgd_t *pgd_base)
}
}
- resume_map_numa_kva(pgd_base);
-
return 0;
}
prev parent reply other threads:[~2013-01-31 22:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 0:56 [RFC][PATCH] rip out x86_32 NUMA remapping code Dave Hansen
2013-01-31 21:24 ` H. Peter Anvin
2013-01-31 21:51 ` H. Peter Anvin
2013-01-31 21:55 ` Yinghai Lu
2013-01-31 21:59 ` H. Peter Anvin
2013-01-31 22:01 ` Yinghai Lu
2013-01-31 22:03 ` H. Peter Anvin
2013-01-31 22:09 ` Dave Hansen
2013-01-31 22:12 ` H. Peter Anvin
2013-01-31 22:41 ` [tip:x86/mm] x86-32, mm: Remove reference to alloc_remap() tip-bot for H. Peter Anvin
2013-01-31 22:39 ` [tip:x86/mm] x86-32, mm: Rip out x86_32 NUMA remapping code tip-bot for Dave Hansen
2013-01-31 22:40 ` tip-bot for H. Peter Anvin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-bb112aec5ee41427e9b9726e3d57b896709598ed@git.kernel.org \
--to=hpa@linux.intel.com \
--cc=dave@linux.vnet.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).