Skip to content

Commit

Permalink
[PATCH] visws build fix
Browse files Browse the repository at this point in the history
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 7d12e78
> Status     : unknown

Via undescribed means.

Signed-off-by: Andrey Panin <pazke@donpac.ru>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andrey Panin authored and Linus Torvalds committed Oct 28, 2006
1 parent 52fd24c commit 08d892f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 57 deletions.
7 changes: 3 additions & 4 deletions arch/i386/mach-visws/visws_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -159,17 +159,16 @@ 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,
.end = end_piix4_master_irq,
};


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,
Expand Down
53 changes: 0 additions & 53 deletions include/asm-i386/mach-visws/do_timer.h

This file was deleted.

5 changes: 5 additions & 0 deletions include/asm-i386/mach-visws/mach_apic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 08d892f

Please sign in to comment.