[PATCH] x86/devicetree: Fix build for amd64

[PATCH] x86/devicetree: Fix build for amd64

[Ricardo Ribalda Delgado]

apic_force_enable is not defined for amd64.

Without this patch:

LD      init/built-in.o
arch/x86/built-in.o: In function `dtb_lapic_setup':
kernel/devicetree.c:155:
undefined reference to `apic_force_enable'
Makefile:923: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 arch/x86/kernel/devicetree.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 3d35033..b5560de 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -152,7 +152,9 @@ static void __init dtb_lapic_setup(void)
 
 	/* Did the boot loader setup the local APIC ? */
 	if (!cpu_has_apic) {
+#ifndef CONFIG_X86_64
 		if (apic_force_enable(r.start))
+#endif
 			return;
 	}
 	smp_found_config = 1;
-- 
2.1.4

Re: [PATCH] x86/devicetree: Fix build for amd64

[Jiang Liu]

Hi Ricardo,
	How about defining a version of apic_force_enable()
for X86_64 in apic.h which just return failure?
Regards!
Gerry

On 2015/2/2 23:50, Ricardo Ribalda Delgado wrote:
> apic_force_enable is not defined for amd64.
> 
> Without this patch:
> 
> LD      init/built-in.o
> arch/x86/built-in.o: In function `dtb_lapic_setup':
> kernel/devicetree.c:155:
> undefined reference to `apic_force_enable'
> Makefile:923: recipe for target 'vmlinux' failed
> make: *** [vmlinux] Error 1
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> ---
>  arch/x86/kernel/devicetree.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
> index 3d35033..b5560de 100644
> --- a/arch/x86/kernel/devicetree.c
> +++ b/arch/x86/kernel/devicetree.c
> @@ -152,7 +152,9 @@ static void __init dtb_lapic_setup(void)
>  
>  	/* Did the boot loader setup the local APIC ? */
>  	if (!cpu_has_apic) {
> +#ifndef CONFIG_X86_64
>  		if (apic_force_enable(r.start))
> +#endif
>  			return;
>  	}
>  	smp_found_config = 1;
> 

Re: [PATCH] x86/devicetree: Fix build for amd64

[Ricardo Ribalda Delgado]

Hello,

That is also an option, but I thought this was cleaner. If you prefer
it that way I can prepare a patch.

Regards

On Mon, Feb 2, 2015 at 5:14 PM, Jiang Liu <jiang.liu@linux.intel.com> wrote:
> Hi Ricardo,
>         How about defining a version of apic_force_enable()
> for X86_64 in apic.h which just return failure?
> Regards!
> Gerry
>
> On 2015/2/2 23:50, Ricardo Ribalda Delgado wrote:
>> apic_force_enable is not defined for amd64.
>>
>> Without this patch:
>>
>> LD      init/built-in.o
>> arch/x86/built-in.o: In function `dtb_lapic_setup':
>> kernel/devicetree.c:155:
>> undefined reference to `apic_force_enable'
>> Makefile:923: recipe for target 'vmlinux' failed
>> make: *** [vmlinux] Error 1
>>
>> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> ---
>>  arch/x86/kernel/devicetree.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
>> index 3d35033..b5560de 100644
>> --- a/arch/x86/kernel/devicetree.c
>> +++ b/arch/x86/kernel/devicetree.c
>> @@ -152,7 +152,9 @@ static void __init dtb_lapic_setup(void)
>>
>>       /* Did the boot loader setup the local APIC ? */
>>       if (!cpu_has_apic) {
>> +#ifndef CONFIG_X86_64
>>               if (apic_force_enable(r.start))
>> +#endif
>>                       return;
>>       }
>>       smp_found_config = 1;
>>



-- 
Ricardo Ribalda