Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/include/asm-parisc ioctl.h,1.1.1.1,1.2 linux_logo.h,1.1.1.1,1.2 md.h,1.1.1.1,1.2 namei.h,1.1.1.1,1.2 pci.h,1.1.1.1,1.2 pgalloc.h,1.1.1.1,1.2 pgtable.h,1.1.1.1,1.2 processor.h,1.1.1.1,1.2 scatterlist.h,1.1.1.1,1.2 semaphore.h,1.1.1.1,1.2 socket.h,1.1.1.2,1.2 termios.h,1.1.1.2,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 12:34:20
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-parisc
In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-parisc
Modified Files:
ioctl.h linux_logo.h md.h namei.h pci.h pgalloc.h pgtable.h
processor.h scatterlist.h semaphore.h socket.h termios.h
Log Message:
Synch to 2.4.15 commit 1
Index: ioctl.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/ioctl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
Index: linux_logo.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/linux_logo.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- linux_logo.h 14 Jan 2001 17:06:25 -0000 1.1.1.1
+++ linux_logo.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -23,26 +23,5 @@
#define linux_logo_banner "Linux/PA-RISC version " UTS_RELEASE
-#define LINUX_LOGO_COLORS 214
-
-#ifdef INCLUDE_LINUX_LOGO_DATA
-
-#define INCLUDE_LINUX_LOGOBW
-#define INCLUDE_LINUX_LOGO16
-
#include <linux/linux_logo.h>
-#else
-
-/* prototypes only */
-extern unsigned char linux_logo_red[];
-extern unsigned char linux_logo_green[];
-extern unsigned char linux_logo_blue[];
-extern unsigned char linux_logo[];
-extern unsigned char linux_logo_bw[];
-extern unsigned char linux_logo16_red[];
-extern unsigned char linux_logo16_green[];
-extern unsigned char linux_logo16_blue[];
-extern unsigned char linux_logo16[];
-
-#endif
Index: md.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/md.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
Index: namei.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/namei.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
Index: pci.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/pci.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pci.h 14 Jan 2001 17:06:28 -0000 1.1.1.1
+++ pci.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -113,7 +113,7 @@
** See Documentation/DMA-mapping.txt
*/
struct pci_dma_ops {
- int (*dma_supported)(struct pci_dev *dev, dma_addr_t mask);
+ int (*dma_supported)(struct pci_dev *dev, u64 mask);
void *(*alloc_consistent)(struct pci_dev *dev, size_t size, dma_addr_t *iova);
void (*free_consistent)(struct pci_dev *dev, size_t size, void *vaddr, dma_addr_t iova);
dma_addr_t (*map_single)(struct pci_dev *dev, void *addr, size_t size, int direction);
@@ -211,5 +211,8 @@
#define PCIBIOS_MIN_IO 0x10
#define PCIBIOS_MIN_MEM 0x1000 /* NBPG - but pci/setup-res.c dies */
+
+/* Return the index of the PCI controller for device PDEV. */
+#define pci_controller_num(PDEV) (0)
#endif /* __ASM_PARISC_PCI_H */
Index: pgalloc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/pgalloc.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pgalloc.h 14 Jan 2001 17:06:34 -0000 1.1.1.1
+++ pgalloc.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -372,7 +372,7 @@
#define pte_free(pte) free_pte_fast(pte)
#define pmd_free(pmd) free_pmd_fast(pmd)
#define pgd_free(pgd) free_pgd_fast(pgd)
-#define pgd_alloc() get_pgd_fast()
+#define pgd_alloc(mm) get_pgd_fast()
extern void __bad_pmd(pmd_t *pmd);
Index: pgtable.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/pgtable.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- pgtable.h 14 Jan 2001 17:06:36 -0000 1.1.1.1
+++ pgtable.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -334,4 +334,9 @@
#define io_remap_page_range remap_page_range
+/*
+ * No page table caches to initialise
+ */
+#define pgtable_cache_init() do { } while (0)
+
#endif /* _PARISC_PAGE_H */
Index: processor.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/processor.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- processor.h 14 Jan 2001 17:06:38 -0000 1.1.1.1
+++ processor.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -107,9 +107,6 @@
/* Thread struct flags. */
#define PARISC_KERNEL_DEATH (1UL << 31) /* see die_if_kernel()... */
-#define INIT_MMAP { &init_mm, 0, 0, NULL, PAGE_SHARED, \
- VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
-
#define INIT_THREAD { { \
{ 0, 0, 0, 0, 0, 0, 0, 0, \
0, 0, 0, 0, 0, 0, 0, 0, \
@@ -335,6 +332,8 @@
#define init_task (init_task_union.task)
#define init_stack (init_task_union.stack)
+
+#define cpu_relax() do { } while (0)
#endif /* __ASM_PARISC_PROCESSOR_H */
Index: scatterlist.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/scatterlist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- scatterlist.h 14 Jan 2001 17:06:38 -0000 1.1.1.1
+++ scatterlist.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -3,8 +3,6 @@
struct scatterlist {
char * address; /* Location data is to be transferred to */
- char * alt_address; /* Location of actual if address is a
- * dma indirect buffer. NULL otherwise */
unsigned int length;
/* an IOVA can be 64-bits on some PA-Risc platforms. */
Index: semaphore.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/semaphore.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- semaphore.h 14 Jan 2001 17:06:40 -0000 1.1.1.1
+++ semaphore.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -17,6 +17,7 @@
*/
#include <linux/spinlock.h>
+#include <linux/rwsem.h>
#include <asm/system.h>
#include <asm/atomic.h>
@@ -133,169 +134,6 @@
#endif
if (atomic_inc_return(&sem->count) <= 0)
__up(sem);
-}
-
-/* rw mutexes (should that be mutices? =) -- throw rw
- * spinlocks and semaphores together, and this is what we
- * end up with...
- *
- * The lock is initialized to BIAS. This way, a writer
- * subtracts BIAS ands gets 0 for the case of an uncontended
- * lock. Readers decrement by 1 and see a positive value
- * when uncontended, negative if there are writers waiting
- * (in which case it goes to sleep).
- *
- * The value 0x01000000 supports up to 128 processors and
- * lots of processes. BIAS must be chosen such that subl'ing
- * BIAS once per CPU will result in the long remaining
- * negative.
- *
- * In terms of fairness, this should result in the lock
- * flopping back and forth between readers and writers
- * under heavy use.
- *
- * -ben
- */
-struct rw_semaphore {
- atomic_t count;
- volatile unsigned char write_bias_granted;
- volatile unsigned char read_bias_granted;
- volatile unsigned char pad1;
- volatile unsigned char pad2;
- wait_queue_head_t wait;
- wait_queue_head_t write_bias_wait;
-#if WAITQUEUE_DEBUG
- long __magic;
- atomic_t readers;
- atomic_t writers;
-#endif
-};
-
-#if WAITQUEUE_DEBUG
-#define __RWSEM_DEBUG_INIT , ATOMIC_INIT(0), ATOMIC_INIT(0)
-#else
-#define __RWSEM_DEBUG_INIT /* */
-#endif
-
-#define RW_LOCK_BIAS 0x01000000
-
-#define __RWSEM_INITIALIZER(name,count) \
-{ ATOMIC_INIT(count), 0, 0, 0, 0, __WAIT_QUEUE_HEAD_INITIALIZER((name).wait), \
- __WAIT_QUEUE_HEAD_INITIALIZER((name).write_bias_wait) \
- __SEM_DEBUG_INIT(name) __RWSEM_DEBUG_INIT }
-
-#define __DECLARE_RWSEM_GENERIC(name,count) \
- struct rw_semaphore name = __RWSEM_INITIALIZER(name,count)
-
-#define DECLARE_RWSEM(name) __DECLARE_RWSEM_GENERIC(name,RW_LOCK_BIAS)
-#define DECLARE_RWSEM_READ_LOCKED(name) __DECLARE_RWSEM_GENERIC(name,RW_LOCK_BIAS-1)
-#define DECLARE_RWSEM_WRITE_LOCKED(name) __DECLARE_RWSEM_GENERIC(name,0)
-
-extern inline void init_rwsem(struct rw_semaphore *sem)
-{
- atomic_set(&sem->count, RW_LOCK_BIAS);
- sem->read_bias_granted = 0;
- sem->write_bias_granted = 0;
- init_waitqueue_head(&sem->wait);
- init_waitqueue_head(&sem->write_bias_wait);
-#if WAITQUEUE_DEBUG
- sem->__magic = (long)&sem->__magic;
- atomic_set(&sem->readers, 0);
- atomic_set(&sem->writers, 0);
-#endif
-}
-
-#ifdef FIXME_WILLY_FIXME_FOR_REAL_THIS_TIME
-extern struct rw_semaphore *__build_read_lock(struct rw_semaphore *sem, const char *what);
-extern struct rw_semaphore *__build_write_lock(struct rw_semaphore *sem, const char *what);
-#endif
-
-/* we use FASTCALL convention for the helpers */
-extern struct rw_semaphore *FASTCALL(__down_read_failed(struct rw_semaphore *sem));
-extern struct rw_semaphore *FASTCALL(__down_write_failed(struct rw_semaphore *sem));
-extern struct rw_semaphore *FASTCALL(__rwsem_wake(struct rw_semaphore *sem));
-
-extern inline void down_read(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
- if (sem->__magic != (long)&sem->__magic)
- BUG();
-#endif
-#ifdef FIXME_WILLY_FIXME_FOR_REAL_THIS_TIME
- __build_read_lock(sem, "__down_read_failed");
-#endif
-#if WAITQUEUE_DEBUG
- if (sem->write_bias_granted)
- BUG();
- if (atomic_read(&sem->writers))
- BUG();
- atomic_inc(&sem->readers);
-#endif
-}
-
-extern inline void down_write(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
- if (sem->__magic != (long)&sem->__magic)
- BUG();
-#endif
-#ifdef FIXME_WILLY_FIXME_FOR_REAL_THIS_TIME
- __build_write_lock(sem, "__down_write_failed");
-#endif
-#if WAITQUEUE_DEBUG
- if (atomic_read(&sem->writers))
- BUG();
- if (atomic_read(&sem->readers))
- BUG();
- if (sem->read_bias_granted)
- BUG();
- if (sem->write_bias_granted)
- BUG();
- atomic_inc(&sem->writers);
-#endif
-}
-
-/* When a reader does a release, the only significant
- * case is when there was a writer waiting, and we've
- * bumped the count to 0: we must wake the writer up.
- */
-extern inline void __up_read(struct rw_semaphore *sem)
-{
-}
-
-/* releasing the writer is easy -- just release it and
- * wake up any sleepers.
- */
-extern inline void __up_write(struct rw_semaphore *sem)
-{
-}
-
-extern inline void up_read(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
- if (sem->write_bias_granted)
- BUG();
- if (atomic_read(&sem->writers))
- BUG();
- atomic_dec(&sem->readers);
-#endif
- __up_read(sem);
-}
-
-extern inline void up_write(struct rw_semaphore *sem)
-{
-#if WAITQUEUE_DEBUG
- if (sem->read_bias_granted)
- BUG();
- if (sem->write_bias_granted)
- BUG();
- if (atomic_read(&sem->readers))
- BUG();
- if (atomic_read(&sem->writers) != 1)
- BUG();
- atomic_dec(&sem->writers);
-#endif
- __up_write(sem);
}
#endif /* _ASM_PARISC_SEMAPHORE_H */
Index: socket.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/socket.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- socket.h 25 Feb 2001 23:14:55 -0000 1.1.1.2
+++ socket.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -56,6 +56,7 @@
/* level. For writing rarp and */
/* other similar things on the */
/* user level. */
+#define SOCK_MAX (SOCK_PACKET+1)
#endif
#endif /* _ASM_SOCKET_H */
Index: termios.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-parisc/termios.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- termios.h 25 Feb 2001 23:14:55 -0000 1.1.1.2
+++ termios.h 9 Apr 2002 12:33:17 -0000 1.2
@@ -53,6 +53,7 @@
#define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Da...@mv...> */
#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */
#define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */
+#define N_HCI 15 /* Bluetooth HCI UART */
#ifdef __KERNEL__
|
