Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d892f1 authored by Andrey Panin's avatar Andrey Panin Committed by Linus Torvalds
Browse files

[PATCH] visws build fix 

Fix this:

> Subject    : CONFIG_X86_VISWS=3Dy, CONFIG_SMP=3Dn compile error
> References : http://lkml.org/lkml/2006/10/7/51


> Submitter  : Jesper Juhl <jesper.juhl@gmail.com>
> Caused-By  : David Howells <dhowells@redhat.com>
>              commit 7d12e780
> Status     : unknown

Via undescribed means.

Signed-off-by: default avatarAndrey Panin <pazke@donpac.ru>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 52fd24ca

arch/i386/mach-visws/visws_apic.c

+3 −4
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void end_cobalt_irq(unsigned int irq) 
	spin_unlock_irqrestore(&cobalt_lock, flags);

}



static struct hw_interrupt_type cobalt_irq_type = {

static struct irq_chip cobalt_irq_type = {

	.typename =	"Cobalt-APIC",

	.startup =	startup_cobalt_irq,

	.shutdown =	disable_cobalt_irq,
@@ -159,7 +159,7 @@ static void end_piix4_master_irq(unsigned int irq) 
	spin_unlock_irqrestore(&cobalt_lock, flags);

}



static struct hw_interrupt_type piix4_master_irq_type = {

static struct irq_chip piix4_master_irq_type = {

	.typename =	"PIIX4-master",

	.startup =	startup_piix4_master_irq,

	.ack =		ack_cobalt_irq,
@@ -167,9 +167,8 @@ static struct hw_interrupt_type piix4_master_irq_type = { 
};





static struct hw_interrupt_type piix4_virtual_irq_type = {

static struct irq_chip piix4_virtual_irq_type = {

	.typename =	"PIIX4-virtual",

	.startup =	startup_8259A_irq,

	.shutdown =	disable_8259A_irq,

	.enable =	enable_8259A_irq,

	.disable =	disable_8259A_irq,

include/asm-i386/mach-visws/do_timer.h

deleted100644 → 0
+0 −53
Original line number Diff line number Diff line 
/* defines for inline arch setup functions */



#include <asm/fixmap.h>

#include <asm/i8259.h>

#include "cobalt.h"



static inline void do_timer_interrupt_hook(void)

{

	/* Clear the interrupt */

	co_cpu_write(CO_CPU_STAT,co_cpu_read(CO_CPU_STAT) & ~CO_STAT_TIMEINTR);



	do_timer(1);

#ifndef CONFIG_SMP

	update_process_times(user_mode_vm(irq_regs));

#endif

/*

 * In the SMP case we use the local APIC timer interrupt to do the

 * profiling, except when we simulate SMP mode on a uniprocessor

 * system, in that case we have to call the local interrupt handler.

 */

#ifndef CONFIG_X86_LOCAL_APIC

	profile_tick(CPU_PROFILING);

#else

	if (!using_apic_timer)

		smp_local_timer_interrupt();

#endif

}



static inline int do_timer_overflow(int count)

{

	int i;



	spin_lock(&i8259A_lock);

	/*

	 * This is tricky when I/O APICs are used;

	 * see do_timer_interrupt().

	 */

	i = inb(0x20);

	spin_unlock(&i8259A_lock);

	

	/* assumption about timer being IRQ0 */

	if (i & 0x01) {

		/*

		 * We cannot detect lost timer interrupts ... 

		 * well, that's why we call them lost, don't we? :)

		 * [hmm, on the Pentium and Alpha we can ... sort of]

		 */

		count -= LATCH;

	} else {

		printk("do_slow_gettimeoffset(): hardware timer problem?\n");

	}

	return count;

}

include/asm-i386/mach-visws/mach_apic.h

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ static inline void clustered_apic_check(void) 
{

}



static inline int apicid_to_node(int logical_apicid)

{

	return 0;

}



/* Mapping from cpu number to logical apicid */

static inline int cpu_to_logical_apicid(int cpu)

{