2007-08-22 23:26:14

by Satyam Sharma

Subject: [PATCH] i386 cpuid: Misc cpuinit annotations

cpuid_class_cpu_callback() is callback function of a CPU hotplug
notifier_block (that is already marked as __cpuinitdata). Therefore
it can safely be marked as __cpuinit.

cpuid_device_create() is only referenced from other functions that
are __cpuinit or __init. So it can also be safely marked __cpuinit.

Signed-off-by: Satyam Sharma <[email protected]>

---

arch/i386/kernel/cpuid.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
index 5c2faa1..a6761fd 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/i386/kernel/cpuid.c
@@ -152,7 +152,7 @@ static const struct file_operations cpuid_fops = {
.open = cpuid_open,
};

-static int cpuid_device_create(int i)
+static int __cpuinit cpuid_device_create(int i)
{
int err = 0;
struct device *dev;
@@ -163,7 +163,9 @@ static int cpuid_device_create(int i)
return err;
}

-static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
+ unsigned long action,
+ void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;

2007-08-23 22:56:54

by H. Peter Anvin

Subject: Re: [PATCH] i386 cpuid: Misc cpuinit annotations

Satyam Sharma wrote:
> cpuid_class_cpu_callback() is callback function of a CPU hotplug
> notifier_block (that is already marked as __cpuinitdata). Therefore
> it can safely be marked as __cpuinit.
>
> cpuid_device_create() is only referenced from other functions that
> are __cpuinit or __init. So it can also be safely marked __cpuinit.
>
> Signed-off-by: Satyam Sharma <[email protected]>

Acked-by: H. Peter Anvin <[email protected]>

> arch/i386/kernel/cpuid.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c
> index 5c2faa1..a6761fd 100644
> --- a/arch/i386/kernel/cpuid.c
> +++ b/arch/i386/kernel/cpuid.c
> @@ -152,7 +152,7 @@ static const struct file_operations cpuid_fops = {
> .open = cpuid_open,
> };
>
> -static int cpuid_device_create(int i)
> +static int __cpuinit cpuid_device_create(int i)
> {
> int err = 0;
> struct device *dev;
> @@ -163,7 +163,9 @@ static int cpuid_device_create(int i)
> return err;
> }
>
> -static int cpuid_class_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
> +static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
> + unsigned long action,
> + void *hcpu)
> {
> unsigned int cpu = (unsigned long)hcpu;
>