diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /include/asm-alpha | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/io.h | 17 | ||||
| -rw-r--r-- | include/asm-alpha/machvec.h | 4 | ||||
| -rw-r--r-- | include/asm-alpha/pci.h | 6 | ||||
| -rw-r--r-- | include/asm-alpha/semaphore.h | 1 | ||||
| -rw-r--r-- | include/asm-alpha/smp.h | 1 |
5 files changed, 24 insertions, 5 deletions
diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h index ddbdedfa2..3d2b51596 100644 --- a/include/asm-alpha/io.h +++ b/include/asm-alpha/io.h @@ -455,6 +455,23 @@ out: #define isa_memcpy_fromio(a,b,c) memcpy_fromio((a),__ioremap(b),(c)) #define isa_memcpy_toio(a,b,c) memcpy_toio(__ioremap(a),(b),(c)) +static inline int +isa_check_signature(unsigned long io_addr, const unsigned char *signature, + int length) +{ + int retval = 0; + do { + if (isa_readb(io_addr) != *signature) + goto out; + io_addr++; + signature++; + length--; + } while (length); + retval = 1; +out: + return retval; +} + /* * The Alpha Jensen hardware for some rather strange reason puts diff --git a/include/asm-alpha/machvec.h b/include/asm-alpha/machvec.h index 0aad19668..ed340a247 100644 --- a/include/asm-alpha/machvec.h +++ b/include/asm-alpha/machvec.h @@ -21,7 +21,7 @@ struct vm_area_struct; struct linux_hose_info; struct pci_dev; struct pci_ops; -struct pci_controler; +struct pci_controller; struct alpha_machine_vector { @@ -40,7 +40,7 @@ struct alpha_machine_vector unsigned long min_io_address; unsigned long min_mem_address; - void (*mv_pci_tbi)(struct pci_controler *hose, + void (*mv_pci_tbi)(struct pci_controller *hose, dma_addr_t start, dma_addr_t end); unsigned int (*mv_inb)(unsigned long); diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 85923e999..781a4882b 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h @@ -16,10 +16,10 @@ struct pci_bus; struct resource; struct pci_iommu_arena; -/* A controler. Used to manage multiple PCI busses. */ +/* A controller. Used to manage multiple PCI busses. */ -struct pci_controler { - struct pci_controler *next; +struct pci_controller { + struct pci_controller *next; struct pci_bus *bus; struct resource *io_space; struct resource *mem_space; diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h index 0e4a1e3a6..c2a511ea4 100644 --- a/include/asm-alpha/semaphore.h +++ b/include/asm-alpha/semaphore.h @@ -12,6 +12,7 @@ #include <asm/system.h> #include <asm/atomic.h> #include <asm/compiler.h> /* __builtin_expect */ +#include <linux/wait.h> #define DEBUG_SEMAPHORE 0 #define DEBUG_RW_SEMAPHORE 0 diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h index f11e254f6..2cc52a7e0 100644 --- a/include/asm-alpha/smp.h +++ b/include/asm-alpha/smp.h @@ -57,6 +57,7 @@ extern int __cpu_logical_map[NR_CPUS]; #define smp_processor_id() (current->processor) extern unsigned long cpu_present_mask; +#define cpu_online_map cpu_present_mask #endif /* CONFIG_SMP */ |