Commit 31a02fd4 authored by David S. Miller's avatar David S. Miller

Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6
parents 1aa3f5ed c976868d
...@@ -156,7 +156,7 @@ void __init prom_meminit(void) ...@@ -156,7 +156,7 @@ void __init prom_meminit(void)
prom_prom_taken[iter].num_bytes = prom_prom_taken[iter].num_bytes =
(unsigned long) prom_reg_memlist[iter].reg_size; (unsigned long) prom_reg_memlist[iter].reg_size;
prom_prom_taken[iter].theres_more = prom_prom_taken[iter].theres_more =
&prom_phys_total[iter+1]; &prom_prom_taken[iter+1];
} }
prom_prom_taken[iter-1].theres_more = 0x0; prom_prom_taken[iter-1].theres_more = 0x0;
......
...@@ -119,6 +119,7 @@ CONFIG_FB=y ...@@ -119,6 +119,7 @@ CONFIG_FB=y
CONFIG_FB_PM2=y CONFIG_FB_PM2=y
# CONFIG_FB_PM2_FIFO_DISCONNECT is not set # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
# CONFIG_FB_CYBER2000 is not set # CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set # CONFIG_FB_IMSTT is not set
# CONFIG_FB_BW2 is not set # CONFIG_FB_BW2 is not set
# CONFIG_FB_CG3 is not set # CONFIG_FB_CG3 is not set
...@@ -277,6 +278,7 @@ CONFIG_BLK_DEV_SIIMAGE=m ...@@ -277,6 +278,7 @@ CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SLC90E66=m CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m CONFIG_BLK_DEV_VIA82CXXX=m
# CONFIG_IDE_ARM is not set
CONFIG_BLK_DEV_IDEDMA=y CONFIG_BLK_DEV_IDEDMA=y
# CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_IVB is not set
CONFIG_IDEDMA_AUTO=y CONFIG_IDEDMA_AUTO=y
...@@ -334,6 +336,7 @@ CONFIG_SCSI_SATA=y ...@@ -334,6 +336,7 @@ CONFIG_SCSI_SATA=y
CONFIG_SCSI_SATA_SVW=m CONFIG_SCSI_SATA_SVW=m
CONFIG_SCSI_ATA_PIIX=m CONFIG_SCSI_ATA_PIIX=m
CONFIG_SCSI_SATA_PROMISE=m CONFIG_SCSI_SATA_PROMISE=m
CONFIG_SCSI_SATA_SX4=m
CONFIG_SCSI_SATA_SIL=m CONFIG_SCSI_SATA_SIL=m
CONFIG_SCSI_SATA_SIS=m CONFIG_SCSI_SATA_SIS=m
CONFIG_SCSI_SATA_VIA=m CONFIG_SCSI_SATA_VIA=m
...@@ -356,6 +359,9 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 ...@@ -356,6 +359,9 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
CONFIG_SCSI_IPR=m
# CONFIG_SCSI_IPR_TRACE is not set
# CONFIG_SCSI_IPR_DUMP is not set
CONFIG_SCSI_QLOGIC_ISP=m CONFIG_SCSI_QLOGIC_ISP=m
CONFIG_SCSI_QLOGIC_FC=y CONFIG_SCSI_QLOGIC_FC=y
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
...@@ -1072,7 +1078,6 @@ CONFIG_MOUSE_VSXXXAA=m ...@@ -1072,7 +1078,6 @@ CONFIG_MOUSE_VSXXXAA=m
# CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y CONFIG_INPUT_MISC=y
# CONFIG_INPUT_PCSPKR is not set
CONFIG_INPUT_SPARCSPKR=y CONFIG_INPUT_SPARCSPKR=y
# CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_UINPUT is not set
...@@ -1139,6 +1144,7 @@ CONFIG_SENSORS_W83627HF=m ...@@ -1139,6 +1144,7 @@ CONFIG_SENSORS_W83627HF=m
CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_EEPROM=m
CONFIG_SENSORS_PCF8574=m CONFIG_SENSORS_PCF8574=m
CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_RTC8564=m
# CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_BUS is not set
...@@ -1260,7 +1266,6 @@ CONFIG_NCP_FS=m ...@@ -1260,7 +1266,6 @@ CONFIG_NCP_FS=m
# CONFIG_NCPFS_EXTRAS is not set # CONFIG_NCPFS_EXTRAS is not set
CONFIG_CODA_FS=m CONFIG_CODA_FS=m
# CONFIG_CODA_FS_OLD_API is not set # CONFIG_CODA_FS_OLD_API is not set
CONFIG_INTERMEZZO_FS=m
CONFIG_AFS_FS=m CONFIG_AFS_FS=m
CONFIG_RXRPC=m CONFIG_RXRPC=m
...@@ -1560,6 +1565,7 @@ CONFIG_USB_WACOM=m ...@@ -1560,6 +1565,7 @@ CONFIG_USB_WACOM=m
CONFIG_USB_KBTAB=m CONFIG_USB_KBTAB=m
# CONFIG_USB_POWERMATE is not set # CONFIG_USB_POWERMATE is not set
CONFIG_USB_MTOUCH=m CONFIG_USB_MTOUCH=m
CONFIG_USB_EGALAX=m
# CONFIG_USB_XPAD is not set # CONFIG_USB_XPAD is not set
CONFIG_USB_ATI_REMOTE=m CONFIG_USB_ATI_REMOTE=m
...@@ -1671,6 +1677,7 @@ CONFIG_USB_LCD=m ...@@ -1671,6 +1677,7 @@ CONFIG_USB_LCD=m
CONFIG_USB_LED=m CONFIG_USB_LED=m
CONFIG_USB_CYTHERM=m CONFIG_USB_CYTHERM=m
CONFIG_USB_SPEEDTOUCH=m CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_PHIDGETSERVO=m
CONFIG_USB_TEST=m CONFIG_USB_TEST=m
# #
......
...@@ -1111,11 +1111,6 @@ void __init smp_tick_init(void) ...@@ -1111,11 +1111,6 @@ void __init smp_tick_init(void)
boot_cpu_id = hard_smp_processor_id(); boot_cpu_id = hard_smp_processor_id();
current_tick_offset = timer_tick_offset; current_tick_offset = timer_tick_offset;
if (boot_cpu_id >= NR_CPUS) {
prom_printf("Serious problem, boot cpu id >= NR_CPUS\n");
prom_halt();
}
cpu_set(boot_cpu_id, cpu_online_map); cpu_set(boot_cpu_id, cpu_online_map);
prof_counter(boot_cpu_id) = prof_multiplier(boot_cpu_id) = 1; prof_counter(boot_cpu_id) = prof_multiplier(boot_cpu_id) = 1;
} }
...@@ -1257,6 +1252,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -1257,6 +1252,11 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
void __devinit smp_prepare_boot_cpu(void) void __devinit smp_prepare_boot_cpu(void)
{ {
if (hard_smp_processor_id() >= NR_CPUS) {
prom_printf("Serious problem, boot cpu id >= NR_CPUS\n");
prom_halt();
}
current_thread_info()->cpu = hard_smp_processor_id(); current_thread_info()->cpu = hard_smp_processor_id();
cpu_set(smp_processor_id(), cpu_online_map); cpu_set(smp_processor_id(), cpu_online_map);
cpu_set(smp_processor_id(), phys_cpu_present_map); cpu_set(smp_processor_id(), phys_cpu_present_map);
......
...@@ -1582,7 +1582,7 @@ void __init paging_init(void) ...@@ -1582,7 +1582,7 @@ void __init paging_init(void)
* prom_set_traptable() call, and OBP is allocating a scratchpad * prom_set_traptable() call, and OBP is allocating a scratchpad
* for saving client program register state etc. * for saving client program register state etc.
*/ */
void __init sort_memlist(struct linux_mlist_p1275 *thislist) static void __init sort_memlist(struct linux_mlist_p1275 *thislist)
{ {
int swapi = 0; int swapi = 0;
int i, mitr; int i, mitr;
......
...@@ -114,7 +114,7 @@ void __init prom_meminit(void) ...@@ -114,7 +114,7 @@ void __init prom_meminit(void)
prom_prom_taken[iter].num_bytes = prom_prom_taken[iter].num_bytes =
prom_reg_memlist[iter].reg_size; prom_reg_memlist[iter].reg_size;
prom_prom_taken[iter].theres_more = prom_prom_taken[iter].theres_more =
&prom_phys_total[iter+1]; &prom_prom_taken[iter+1];
} }
prom_prom_taken[iter-1].theres_more = 0x0; prom_prom_taken[iter-1].theres_more = 0x0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment