From bc6671d862d5ef567227163573fa1c68abe58f20 Mon Sep 17 00:00:00 2001 From: Ben Guthro Date: Thu, 18 Apr 2013 17:39:48 -0400 Subject: [PATCH] --- yaml --- r: 362762 b: refs/heads/master c: 18c0025b692a293e3e4aecb34264563c0a442448 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/xen/xen-acpi-processor.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 630ba78451f4..e707f0e2be11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fac10145b766a2244422788f62dc35978613fd8 +refs/heads/master: 18c0025b692a293e3e4aecb34264563c0a442448 diff --git a/trunk/drivers/xen/xen-acpi-processor.c b/trunk/drivers/xen/xen-acpi-processor.c index e2a53337725d..8abd7d579037 100644 --- a/trunk/drivers/xen/xen-acpi-processor.c +++ b/trunk/drivers/xen/xen-acpi-processor.c @@ -330,7 +330,7 @@ static unsigned int __init get_max_acpi_id(void) * for_each_[present|online]_cpu macros which are banded to the virtual * CPU amount. */ -static acpi_status __init +static acpi_status read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) { u32 acpi_id; @@ -385,7 +385,7 @@ read_acpi_id(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; } -static int __init check_acpi_ids(struct acpi_processor *pr_backup) +static int check_acpi_ids(struct acpi_processor *pr_backup) { if (!pr_backup)