summaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-i386')
-rw-r--r--include/asm-i386/bitops.h12
-rw-r--r--include/asm-i386/i8254.h1
-rw-r--r--include/asm-i386/i8259.h2
-rw-r--r--include/asm-i386/ibmpc.h2
-rw-r--r--include/asm-i386/ic/sc520.h8
-rw-r--r--include/asm-i386/io.h9
-rw-r--r--include/asm-i386/pci.h2
-rw-r--r--include/asm-i386/processor.h2
-rw-r--r--include/asm-i386/ptrace.h2
-rw-r--r--include/asm-i386/realmode.h2
-rw-r--r--include/asm-i386/types.h1
-rw-r--r--include/asm-i386/u-boot.h4
-rw-r--r--include/asm-i386/zimage.h10
13 files changed, 26 insertions, 31 deletions
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index 7d29335..b768e20 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -116,7 +116,7 @@ static __inline__ void change_bit(int nr, volatile void * addr)
* @nr: Bit to set
* @addr: Address to count from
*
- * This operation is atomic and cannot be reordered.
+ * This operation is atomic and cannot be reordered.
* It also implies a memory barrier.
*/
static __inline__ int test_and_set_bit(int nr, volatile void * addr)
@@ -135,7 +135,7 @@ static __inline__ int test_and_set_bit(int nr, volatile void * addr)
* @nr: Bit to set
* @addr: Address to count from
*
- * This operation is non-atomic and can be reordered.
+ * This operation is non-atomic and can be reordered.
* If two examples of this operation race, one can appear to succeed
* but actually fail. You must protect multiple accesses with a lock.
*/
@@ -155,7 +155,7 @@ static __inline__ int __test_and_set_bit(int nr, volatile void * addr)
* @nr: Bit to set
* @addr: Address to count from
*
- * This operation is atomic and cannot be reordered.
+ * This operation is atomic and cannot be reordered.
* It also implies a memory barrier.
*/
static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
@@ -174,7 +174,7 @@ static __inline__ int test_and_clear_bit(int nr, volatile void * addr)
* @nr: Bit to set
* @addr: Address to count from
*
- * This operation is non-atomic and can be reordered.
+ * This operation is non-atomic and can be reordered.
* If two examples of this operation race, one can appear to succeed
* but actually fail. You must protect multiple accesses with a lock.
*/
@@ -206,7 +206,7 @@ static __inline__ int __test_and_change_bit(int nr, volatile void * addr)
* @nr: Bit to set
* @addr: Address to count from
*
- * This operation is atomic and cannot be reordered.
+ * This operation is atomic and cannot be reordered.
* It also implies a memory barrier.
*/
static __inline__ int test_and_change_bit(int nr, volatile void * addr)
@@ -292,7 +292,7 @@ static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
{
unsigned long * p = ((unsigned long *) addr) + (offset >> 5);
int set = 0, bit = offset & 31, res;
-
+
if (bit) {
/*
* Look for zero in first byte
diff --git a/include/asm-i386/i8254.h b/include/asm-i386/i8254.h
index e13f04e..aafdfb8 100644
--- a/include/asm-i386/i8254.h
+++ b/include/asm-i386/i8254.h
@@ -29,7 +29,6 @@
#define _ASMI386_I8954_H_ 1
-
#define PIT_T0 0x00 /* PIT channel 0 count/status */
#define PIT_T1 0x01 /* PIT channel 1 count/status */
#define PIT_T2 0x02 /* PIT channel 2 count/status */
diff --git a/include/asm-i386/i8259.h b/include/asm-i386/i8259.h
index 0419e0e..774d7a3 100644
--- a/include/asm-i386/i8259.h
+++ b/include/asm-i386/i8259.h
@@ -78,7 +78,7 @@
/* ICW2 is the starting vector number */
-/* ICW2 is bit-mask of present slaves for a master device,
+/* ICW2 is bit-mask of present slaves for a master device,
* or the slave ID for a slave device */
/* ICW4 bits */
diff --git a/include/asm-i386/ibmpc.h b/include/asm-i386/ibmpc.h
index abdd1d7..e35cbd8 100644
--- a/include/asm-i386/ibmpc.h
+++ b/include/asm-i386/ibmpc.h
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
diff --git a/include/asm-i386/ic/sc520.h b/include/asm-i386/ic/sc520.h
index 1836f99..d5abbbe 100644
--- a/include/asm-i386/ic/sc520.h
+++ b/include/asm-i386/ic/sc520.h
@@ -230,7 +230,7 @@
#define UART1_DIS 0x01 /* UART1 Disable */
/* bus mapping constants (used for PCI core initialization) */ /* bus mapping constants */
-#define SC520_REG_ADDR 0x00000cf8
+#define SC520_REG_ADDR 0x00000cf8
#define SC520_REG_DATA 0x00000cfc
@@ -242,7 +242,7 @@
#define SC520_ISA_IO_BUS 0x00000000
#define SC520_ISA_IO_SIZE 0x00001000
-/* PCI I/O space from 0x1000 to 0xdfff
+/* PCI I/O space from 0x1000 to 0xdfff
* (make 0xe000-0xfdff available for stuff like PCCard boot) */
#define SC520_PCI_IO_PHYS 0x00001000
#define SC520_PCI_IO_BUS 0x00001000
@@ -253,7 +253,7 @@
#define SC520_PCI_MEMORY_BUS 0x00000000
#define SC520_PCI_MEMORY_SIZE 0x10000000
-/* PCI bus memory from 0x10000000 to 0x26ffffff
+/* PCI bus memory from 0x10000000 to 0x26ffffff
* (make 0x27000000 - 0x27ffffff available for stuff like PCCard boot) */
#define SC520_PCI_MEM_PHYS 0x10000000
#define SC520_PCI_MEM_BUS 0x10000000
@@ -275,7 +275,7 @@
#define SC520_IRQ7 22
#define SC520_IRQ8 3
#define SC520_IRQ9 4
-#define SC520_IRQ10 5
+#define SC520_IRQ10 5
#define SC520_IRQ11 6
#define SC520_IRQ12 7
#define SC520_IRQ13 8
diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h
index d17d45e..85d44aa 100644
--- a/include/asm-i386/io.h
+++ b/include/asm-i386/io.h
@@ -84,7 +84,6 @@
#define isa_memcpy_toio(a,b,c) memcpy_toio((a),(b),(c))
-
static inline int check_signature(unsigned long io_addr,
const unsigned char *signature, int length)
{
@@ -103,7 +102,7 @@ out:
/**
* isa_check_signature - find BIOS signatures
- * @io_addr: mmio address to check
+ * @io_addr: mmio address to check
* @signature: signature block
* @length: length of signature
*
@@ -113,7 +112,7 @@ out:
* This function is deprecated. New drivers should use ioremap and
* check_signature.
*/
-
+
static inline int isa_check_signature(unsigned long io_addr,
const unsigned char *signature, int length)
@@ -158,7 +157,7 @@ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
#define __OUT(s,s1,x) \
__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "Nd" (port)); } \
-__OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));}
+__OUT1(s##_p,x) __OUT2(s,s1,"w") __FULL_SLOW_DOWN_IO : : "a" (value), "Nd" (port));}
#define __IN1(s) \
static inline RETURN_TYPE in##s(unsigned short port) { RETURN_TYPE _v;
@@ -168,7 +167,7 @@ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
#define __IN(s,s1,i...) \
__IN1(s) __IN2(s,s1,"w") : "=a" (_v) : "Nd" (port) ,##i ); return _v; } \
-__IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; }
+__IN1(s##_p) __IN2(s,s1,"w") __FULL_SLOW_DOWN_IO : "=a" (_v) : "Nd" (port) ,##i ); return _v; }
#define __INS(s) \
static inline void ins##s(unsigned short port, void * addr, unsigned long count) \
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 3a91f57..bde9550 100644
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -32,6 +32,4 @@ int pci_shadow_rom(pci_dev_t dev, unsigned char *dest);
void pci_remove_rom_window(struct pci_controller* hose, u32 addr);
u32 pci_get_rom_window(struct pci_controller* hose, int size);
-
-
#endif
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index c175193..5dedba8 100644
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
diff --git a/include/asm-i386/ptrace.h b/include/asm-i386/ptrace.h
index d99e464..750e40d 100644
--- a/include/asm-i386/ptrace.h
+++ b/include/asm-i386/ptrace.h
@@ -20,7 +20,7 @@
#define SS 16
#define FRAME_SIZE 17
-/* this struct defines the way the registers are stored on the
+/* this struct defines the way the registers are stored on the
stack during a system call. */
struct pt_regs {
diff --git a/include/asm-i386/realmode.h b/include/asm-i386/realmode.h
index a84f128..9177e4e 100644
--- a/include/asm-i386/realmode.h
+++ b/include/asm-i386/realmode.h
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
diff --git a/include/asm-i386/types.h b/include/asm-i386/types.h
index bb100ec..69f8a5a 100644
--- a/include/asm-i386/types.h
+++ b/include/asm-i386/types.h
@@ -48,4 +48,3 @@ typedef u32 dma_addr_t;
#endif /* __KERNEL__ */
#endif
-
diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index dc5dd72..3466732 100644
--- a/include/asm-i386/u-boot.h
+++ b/include/asm-i386/u-boot.h
@@ -2,7 +2,7 @@
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de>
- *
+ *
* (C) Copyright 2002
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Alex Zuepke <azu@sysgo.de>
@@ -47,7 +47,7 @@ typedef struct bd_info {
unsigned long bi_boot_params; /* where this board expects params */
struct environment_s *bi_env;
struct /* RAM configuration */
- {
+ {
ulong start;
ulong size;
}bi_dram[CONFIG_NR_DRAM_BANKS];
diff --git a/include/asm-i386/zimage.h b/include/asm-i386/zimage.h
index 6886826..c7103b1 100644
--- a/include/asm-i386/zimage.h
+++ b/include/asm-i386/zimage.h
@@ -1,7 +1,7 @@
/*
* (C) Copyright 2002
* Daniel Engström, Omicron Ceti AB, daniel@omicron.se
- *
+ *
* See file CREDITS for list of people who contributed to this
* project.
*
@@ -24,7 +24,7 @@
#ifndef _ASM_ZIMAGE_H_
#define _ASM_ZIMAGE_H_
-/* linux i386 zImage/bzImage header. Offsets relative to
+/* linux i386 zImage/bzImage header. Offsets relative to
* the start of the image */
#define CMD_LINE_MAGIC_OFF 0x020 /* Magic 0xa33f if the offset below is valid */
@@ -62,10 +62,10 @@
#define SETUP_MAX_SIZE 32768
#define SETUP_START_OFFSET 0x200
-#define BZIMAGE_LOAD_ADDR 0x100000
+#define BZIMAGE_LOAD_ADDR 0x100000
#define ZIMAGE_LOAD_ADDR 0x10000
-
-void *load_zimage(char *image, unsigned long kernel_size,
+
+void *load_zimage(char *image, unsigned long kernel_size,
unsigned long initrd_addr, unsigned long initrd_size,
int auto_boot);
generated by cgit v1.1 at 2024-10-31 00:53:10 +0000