Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make

arch/i386/kernel/mpparse.c

@@ -109,13 +109,13 @@ void __init MP_processor_info (struct mpc_config_processor *m)
 		quad = translation_table[mpc_record]->trans_quad;
 		logical_apicid = (quad << 4) + 
 			(m->mpc_apicid ? m->mpc_apicid << 1 : 1);
-		printk("Processor #%d %d:%d APIC version %d (quad %d, apic %d)\n",
+		printk("Processor #%d %ld:%ld APIC version %d (quad %d, apic %d)\n",
 			m->mpc_apicid,
 		        (m->mpc_cpufeature & CPU_FAMILY_MASK)>>8,
 			(m->mpc_cpufeature & CPU_MODEL_MASK)>>4,
 			m->mpc_apicver, quad, logical_apicid);
 	} else {
-		printk("Processor #%d %d:%d APIC version %d\n",
+		printk("Processor #%d %ld:%ld APIC version %d\n",
 			m->mpc_apicid,
 			(m->mpc_cpufeature & CPU_FAMILY_MASK)>>8,
 			(m->mpc_cpufeature & CPU_MODEL_MASK)>>4,

drivers/acpi/include/platform/aclinux.h

@@ -69,7 +69,4 @@
 
 #include "acgcc.h"
 
-#undef DEBUGGER_THREADING
-#define DEBUGGER_THREADING	DEBUGGER_SINGLE_THREADED
-
 #endif /* __ACLINUX_H__ */

drivers/pcmcia/ti113x.h

@@ -195,6 +195,8 @@ static struct pci_socket_ops ti_ops = {
 #define ti_sysctl(socket)	((socket)->private[0])
 #define ti_cardctl(socket)	((socket)->private[1])
 #define ti_devctl(socket)	((socket)->private[2])
+#define ti_diag(socket)		((socket)->private[3])
+#define ti_irqmux(socket)	((socket)->private[4])
 
 static int ti113x_open(pci_socket_t *socket)
 {
@@ -235,7 +237,6 @@ static struct pci_socket_ops ti113x_ops = {
 	yenta_proc_setup
 };
 
-#define ti_diag(socket)		((socket)->private[0])
 
 static int ti1250_open(pci_socket_t *socket)
 {
@@ -244,16 +245,22 @@ static int ti1250_open(pci_socket_t *socket)
 	ti_diag(socket) &= ~(TI1250_DIAG_PCI_CSC | TI1250_DIAG_PCI_IREQ);
 	if (socket->cb_irq)
 		ti_diag(socket) |= TI1250_DIAG_PCI_CSC | TI1250_DIAG_PCI_IREQ;
-	ti_open(socket);
+	ti113x_open(socket);
 	return 0;
 }
 
 static int ti1250_init(pci_socket_t *socket)
 {
 	yenta_init(socket);
-
+	ti113x_init(socket);
+	ti_irqmux(socket) = config_readl(socket, TI122X_IRQMUX);
+	ti_irqmux(socket) = (ti_irqmux(socket) & ~0x0f) | 0x02; /* route INTA */
+	if (!(ti_sysctl(socket) & TI122X_SCR_INTRTIE))
+		ti_irqmux(socket) |= 0x20; /* route INTB */
+	
+	config_writel(socket, TI122X_IRQMUX, ti_irqmux(socket));
+		
 	config_writeb(socket, TI1250_DIAGNOSTIC, ti_diag(socket));
-	ti_intctl(socket);
 	return 0;
 }
 

drivers/pcmcia/yenta.c

@@ -806,7 +806,7 @@ static struct cardbus_override_struct {
 	{ PD(TI,1251A),	&ti_ops },
 	{ PD(TI,1211),	&ti_ops },
 	{ PD(TI,1251B),	&ti_ops },
-	{ PD(TI,1410),	&ti_ops },
+	{ PD(TI,1410),	&ti1250_ops },
 	{ PD(TI,1420),	&ti_ops },
 	{ PD(TI,4410),	&ti_ops },
 	{ PD(TI,4451),	&ti_ops },

include/linux/types.h

@@ -3,6 +3,9 @@
 
 #ifdef	__KERNEL__
 #include <linux/config.h>
+
+#define bitmap_member(name,bits) \
+	unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
 #endif
 
 #include <linux/posix_types.h>

include/sound/core.h

@@ -345,7 +345,7 @@ void snd_printd(const char *format, ...);
 #else /* !CONFIG_SND_DEBUG */
 
 #define snd_printd(fmt, args...)	/* nothing */
-#define snd_assert(expr, args...)	/* nothing */
+#define snd_assert(expr, args...)	(void)(expr)
 #define snd_runtime_check(expr, args...) do { if (!(expr)) { args; } } while (0)
 
 #endif /* CONFIG_SND_DEBUG */

include/sound/pcm_params.h

@@ -38,7 +38,7 @@ extern int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
 /* To share the same code we have  alsa-lib */
 #define snd_mask_bits(mask) (*(mask))
 #define INLINE static inline
-#define assert(a)
+#define assert(a) (void)(a)
 
 INLINE unsigned int ld2(u_int32_t v)
 {

sound/core/rawmidi.c

@@ -143,7 +143,7 @@ int snd_rawmidi_drain_output(snd_rawmidi_substream_t * substream)
 			break;
 		}
 		if (runtime->avail < runtime->buffer_size && !timeout) {
-			snd_printk(KERN_WARNING "rawmidi drain error (avail = %li, buffer_size = %li)\n", runtime->avail, runtime->buffer_size);
+			snd_printk(KERN_WARNING "rawmidi drain error (avail = %i, buffer_size = %i)\n", runtime->avail, runtime->buffer_size);
 			err = -EIO;
 			break;
 		}

sound/core/seq/seq_clientmgr.c

@@ -469,7 +469,7 @@ static client_t *get_event_dest_client(snd_seq_event_t *event, int filter)
 	if (! dest->accept_input)
 		goto __not_avail;
 	if ((dest->filter & SNDRV_SEQ_FILTER_USE_EVENT) &&
-	    ! test_bit(event->type, &dest->event_filter))
+	    ! test_bit(event->type, dest->event_filter))
 		goto __not_avail;
 	if (filter && !(dest->filter & filter))
 		goto __not_avail;

sound/core/seq/seq_clientmgr.h

@@ -53,8 +53,8 @@ struct _snd_seq_client {
 	char name[64];		/* client name */
 	int number;		/* client number */
 	unsigned int filter;	/* filter flags */
-	unsigned char client_filter[32];
-	unsigned char event_filter[32];
+	bitmap_member(client_filter, 256);
+	bitmap_member(event_filter, 256);
 	snd_use_lock_t use_lock;
 	int event_lost;
 	/* ports */

sound/core/seq/seq_queue.c

@@ -544,10 +544,10 @@ int snd_seq_queue_use(int queueid, int client, int use)
 		return -EINVAL;
 	down(&queue->timer_mutex);
 	if (use) {
-		if (!test_and_set_bit(client, &queue->clients_bitmap))
+		if (!test_and_set_bit(client, queue->clients_bitmap))
 			queue->clients++;
 	} else {
-		if (test_and_clear_bit(client, &queue->clients_bitmap))
+		if (test_and_clear_bit(client, queue->clients_bitmap))
 			queue->clients--;
 	}
 	if (queue->clients) {
@@ -575,7 +575,7 @@ int snd_seq_queue_is_used(int queueid, int client)
 	q = queueptr(queueid);
 	if (q == NULL)
 		return -EINVAL; /* invalid queue */
-	result = test_bit(client, &q->clients_bitmap) ? 1 : 0;
+	result = test_bit(client, q->clients_bitmap) ? 1 : 0;
 	queuefree(q);
 	return result;
 }

sound/core/seq/seq_queue.h

@@ -51,7 +51,7 @@ struct _snd_seq_queue {
 	spinlock_t check_lock;
 
 	/* clients which uses this queue (bitmap) */
-	unsigned int clients_bitmap[SNDRV_SEQ_MAX_CLIENTS/sizeof(unsigned long)];
+	bitmap_member(clients_bitmap,SNDRV_SEQ_MAX_CLIENTS);
 	unsigned int clients;	/* users of this queue */
 	struct semaphore timer_mutex;