diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 19:30:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 19:30:46 -0400 |
| commit | 3045f94a20cc54e3e5b20a843701eeab86f57163 (patch) | |
| tree | 3f5e4fd6ed396f73ce2120a22ce93df94163fadb /kernel/resource.c | |
| parent | 52e8ad9066b57510e600acc4bbc4455a81732c6c (diff) | |
| parent | fb476cffd5e345434c03f3c0e82a7e8d87f98ab0 (diff) | |
Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS update from Ingo Molnar:
"The changes in this tree are:
- ACPI APEI (ACPI Platform Error Interface) improvements, by Chen
Gong
- misc MCE fixes/cleanups"
* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Update MCE severity condition check
mce: acpi/apei: Add comments to clarify usage of the various bitfields in the MCA subsystem
ACPI/APEI: Update einj documentation for param1/param2
ACPI/APEI: Add parameter check before error injection
ACPI, APEI, EINJ: Fix error return code in einj_init()
x86, mce: Fix "braodcast" typo
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index d7386986e10e..77bf11a86c7d 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -409,6 +409,7 @@ int __weak page_is_ram(unsigned long pfn) | |||
| 409 | { | 409 | { |
| 410 | return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1; | 410 | return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1; |
| 411 | } | 411 | } |
| 412 | EXPORT_SYMBOL_GPL(page_is_ram); | ||
| 412 | 413 | ||
| 413 | void __weak arch_remove_reservations(struct resource *avail) | 414 | void __weak arch_remove_reservations(struct resource *avail) |
| 414 | { | 415 | { |