]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96d803d a70c0c0)
Merge with c99 initializers patch.
authorRichard Henderson <rth@dot.sfbay.redhat.com>
Sun, 3 Nov 2002 05:58:06 +0000 (21:58 -0800)
committerRichard Henderson <rth@are.twiddle.net>
Sun, 3 Nov 2002 05:58:06 +0000 (21:58 -0800)
1  2 
arch/alpha/kernel/core_cia.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_alcor.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_cabriolet.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_miata.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_mikasa.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_noritake.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_ruffian.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_sx164.c patch | diff1 | diff2 | blob | history
arch/alpha/kernel/sys_takara.c patch | diff1 | diff2 | blob | history

diff --cc arch/alpha/kernel/core_cia.c
Simple merge
diff --cc arch/alpha/kernel/sys_alcor.c
Simple merge
diff --cc arch/alpha/kernel/sys_cabriolet.c
index 68fb947bb057e85252a16cb09e7cdb7a166e189f,1b606c3661a4603d22e8cccbc953ad281d2ec3a5..a92fd306982ef4df25a0e8c69a7b508177eec2d9
--- 1/arch/alpha/kernel/sys_cabriolet.c
--- 2/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@@ -326,21 -326,20 +326,20 @@@ struct alpha_machine_vector cabriolet_m
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          apecs_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cabriolet_init_pci,
 -      pci_map_irq:            cabriolet_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = apecs_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cabriolet_init_pci,
-       .kill_arch              = NULL,
 +      .pci_map_irq            = cabriolet_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  #ifndef CONFIG_ALPHA_EB64P
  ALIAS_MV(cabriolet)
@@@ -354,20 -353,21 +353,21 @@@ struct alpha_machine_vector eb164_mv __
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_cab_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            cabriolet_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_cab_init_pci,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = cabriolet_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(eb164)
  #endif
@@@ -404,21 -404,22 +404,22 @@@ struct alpha_machine_vector lx164_mv __
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       cabriolet_device_interrupt,
 -
 -      init_arch:              pyxis_init_arch,
 -      init_irq:               cabriolet_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               alphapc164_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            alphapc164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = cabriolet_device_interrupt,
 +
 +      .init_arch              = pyxis_init_arch,
 +      .init_irq               = cabriolet_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = alphapc164_init_pci,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = alphapc164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(lx164)
  #endif
@@@ -430,20 -431,21 +431,21 @@@ struct alpha_machine_vector pc164_mv __
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                35,
 -      device_interrupt:       pc164_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               pc164_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               alphapc164_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            alphapc164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 35,
 +      .device_interrupt       = pc164_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = pc164_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = alphapc164_init_pci,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = alphapc164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(pc164)
  #endif
diff --cc arch/alpha/kernel/sys_miata.c
Simple merge
diff --cc arch/alpha/kernel/sys_mikasa.c
index f06e342c71d98ee67657a4c6e8ccdb3e3b5d20c2,00e7d05a42e9fea4d28fc7414dce7875587edb49..336ba38b63ff1d37151e5ca01f02a20a550cc1f5
--- 1/arch/alpha/kernel/sys_mikasa.c
--- 2/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@@ -222,21 -222,20 +222,20 @@@ struct alpha_machine_vector mikasa_mv _
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          mikasa_apecs_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       mikasa_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               mikasa_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      pci_map_irq:            mikasa_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = mikasa_apecs_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = mikasa_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = mikasa_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
-       .kill_arch              = NULL,
 +      .pci_map_irq            = mikasa_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(mikasa)
  #endif
@@@ -248,20 -247,21 +247,21 @@@ struct alpha_machine_vector mikasa_prim
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                32,
 -      device_interrupt:       mikasa_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               mikasa_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            mikasa_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 32,
 +      .device_interrupt       = mikasa_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = mikasa_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = mikasa_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(mikasa_primo)
  #endif
diff --cc arch/alpha/kernel/sys_noritake.c
index 3e3aecf94b360a3e38bf3177adee28057c13cd0f,d3e556c1c46385bd337b0b54e78c1a2299cf7be4..5f5d58f0d09e05a42a99c5e16b7bb542840c7ee3
--- 1/arch/alpha/kernel/sys_noritake.c
--- 2/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@@ -304,21 -304,20 +304,20 @@@ struct alpha_machine_vector noritake_m
        DO_DEFAULT_RTC,
        DO_APECS_IO,
        DO_APECS_BUS,
 -      machine_check:          noritake_apecs_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        APECS_AND_LCA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       noritake_device_interrupt,
 -
 -      init_arch:              apecs_init_arch,
 -      init_irq:               noritake_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               common_init_pci,
 -      pci_map_irq:            noritake_map_irq,
 -      pci_swizzle:            noritake_swizzle,
 +      .machine_check          = noritake_apecs_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = APECS_AND_LCA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = noritake_device_interrupt,
 +
 +      .init_arch              = apecs_init_arch,
 +      .init_irq               = noritake_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = common_init_pci,
-       .kill_arch              = NULL,
 +      .pci_map_irq            = noritake_map_irq,
 +      .pci_swizzle            = noritake_swizzle,
  };
  ALIAS_MV(noritake)
  #endif
@@@ -330,20 -329,21 +329,21 @@@ struct alpha_machine_vector noritake_pr
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         EISA_DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       noritake_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               noritake_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               cia_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            noritake_map_irq,
 -      pci_swizzle:            noritake_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = EISA_DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = noritake_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = noritake_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = cia_init_pci,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = noritake_map_irq,
 +      .pci_swizzle            = noritake_swizzle,
  };
  ALIAS_MV(noritake_primo)
  #endif
diff --cc arch/alpha/kernel/sys_ruffian.c
Simple merge
diff --cc arch/alpha/kernel/sys_sx164.c
index ebd4d89e8f5b887432ecd661bd01b06fb8fa288c,a46a19a143dfd7e104ba9eccd5c3f29255fb0eb9..9609a2a450a1af06e82d96397e4fcb12ec27b788
--- 1/arch/alpha/kernel/sys_sx164.c
--- 2/arch/alpha/kernel/sys_sx164.c
+++ b/arch/alpha/kernel/sys_sx164.c
@@@ -159,21 -159,21 +159,21 @@@ struct alpha_machine_vector sx164_mv __
        DO_DEFAULT_RTC,
        DO_PYXIS_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        DEFAULT_MEM_BASE,
 -      pci_dac_offset:         PYXIS_DAC_OFFSET,
 -
 -      nr_irqs:                48,
 -      device_interrupt:       pyxis_device_interrupt,
 -
 -      init_arch:              sx164_init_arch,
 -      init_irq:               sx164_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               sx164_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            sx164_map_irq,
 -      pci_swizzle:            common_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = DEFAULT_MEM_BASE,
 +      .pci_dac_offset         = PYXIS_DAC_OFFSET,
 +
 +      .nr_irqs                = 48,
 +      .device_interrupt       = pyxis_device_interrupt,
 +
 +      .init_arch              = sx164_init_arch,
 +      .init_irq               = sx164_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = sx164_init_pci,
-       .kill_arch              = NULL,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = sx164_map_irq,
 +      .pci_swizzle            = common_swizzle,
  };
  ALIAS_MV(sx164)
diff --cc arch/alpha/kernel/sys_takara.c
index 6159efaf6386d4f6b4329290ff807f6b90ce94ad,f8cfefc02c062727e1dd7e4849b85f71ddfbc516..56f184417bf4ee26c0b8dc023c5f6ab50bca8680
--- 1/arch/alpha/kernel/sys_takara.c
--- 2/arch/alpha/kernel/sys_takara.c
+++ b/arch/alpha/kernel/sys_takara.c
@@@ -274,20 -274,20 +274,20 @@@ struct alpha_machine_vector takara_mv _
        DO_DEFAULT_RTC,
        DO_CIA_IO,
        DO_CIA_BUS,
 -      machine_check:          cia_machine_check,
 -      max_dma_address:        ALPHA_MAX_DMA_ADDRESS,
 -      min_io_address:         DEFAULT_IO_BASE,
 -      min_mem_address:        CIA_DEFAULT_MEM_BASE,
 -
 -      nr_irqs:                128,
 -      device_interrupt:       takara_device_interrupt,
 -
 -      init_arch:              cia_init_arch,
 -      init_irq:               takara_init_irq,
 -      init_rtc:               common_init_rtc,
 -      init_pci:               takara_init_pci,
 -      kill_arch:              cia_kill_arch,
 -      pci_map_irq:            takara_map_irq,
 -      pci_swizzle:            takara_swizzle,
 +      .machine_check          = cia_machine_check,
 +      .max_dma_address        = ALPHA_MAX_DMA_ADDRESS,
 +      .min_io_address         = DEFAULT_IO_BASE,
 +      .min_mem_address        = CIA_DEFAULT_MEM_BASE,
 +
 +      .nr_irqs                = 128,
 +      .device_interrupt       = takara_device_interrupt,
 +
 +      .init_arch              = cia_init_arch,
 +      .init_irq               = takara_init_irq,
 +      .init_rtc               = common_init_rtc,
 +      .init_pci               = takara_init_pci,
-       .kill_arch              = NULL,
++      .kill_arch              = cia_kill_arch,
 +      .pci_map_irq            = takara_map_irq,
 +      .pci_swizzle            = takara_swizzle,
  };
  ALIAS_MV(takara)
Linux kernels and configurations used by Zygo.