Menu
▾
▴
linux-vax-k25-commit — Notifications of CVS commits to kernel 2.5 tree
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
(66) |
Jul
(16) |
Aug
(2) |
Sep
(7) |
Oct
(17) |
Nov
(1) |
Dec
(220) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(154) |
Feb
(167) |
Mar
(159) |
Apr
(172) |
May
(35) |
Jun
(58) |
Jul
(97) |
Aug
(285) |
Sep
(139) |
Oct
(252) |
Nov
(8) |
Dec
(3) |
| 2004 |
Jan
(13) |
Feb
(159) |
Mar
(136) |
Apr
(33) |
May
(50) |
Jun
(42) |
Jul
(140) |
Aug
(42) |
Sep
(199) |
Oct
(31) |
Nov
(55) |
Dec
|
| 2005 |
Jan
|
Feb
(12) |
Mar
(214) |
Apr
(119) |
May
(21) |
Jun
(2) |
Jul
(127) |
Aug
(10) |
Sep
(3) |
Oct
(24) |
Nov
(1) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(45) |
May
(13) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(26) |
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(35) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Kenn H. <ke...@us...> - 2005-04-05 21:31:35
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/ia64/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13621/arch/ia64/kernel Removed Files: efivars.c Log Message: Remove files that were removed by Linus, but missed in previous merges --- efivars.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2005-04-05 21:31:34
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13621/arch/arm/common Removed Files: sa1111-pcibuf.c Log Message: Remove files that were removed by Linus, but missed in previous merges --- sa1111-pcibuf.c DELETED --- |
|
From: Kenn H. <ke...@us...> - 2005-04-05 21:31:34
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/configs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13621/arch/arm/configs Removed Files: anakin_defconfig Log Message: Remove files that were removed by Linus, but missed in previous merges --- anakin_defconfig DELETED --- |
|
From: Kenn H. <ke...@us...> - 2005-04-05 21:31:34
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/DocBook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13621/Documentation/DocBook Removed Files: parport-multi.fig parport-share.fig parport-structure.fig parportbook.tmpl Log Message: Remove files that were removed by Linus, but missed in previous merges --- parportbook.tmpl DELETED --- --- parport-share.fig DELETED --- --- parport-structure.fig DELETED --- --- parport-multi.fig DELETED --- |
|
From: Kenn H. <ke...@us...> - 2005-04-05 21:31:34
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/arm/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13621/arch/arm/mm Removed Files: fault-common.c Log Message: Remove files that were removed by Linus, but missed in previous merges --- fault-common.c DELETED --- |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-05 12:12:11
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1138 Modified Files: keep_an_eye_on.txt Log Message: - Mention __iomem attribute. Index: keep_an_eye_on.txt =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/keep_an_eye_on.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- keep_an_eye_on.txt 5 Apr 2005 11:49:50 -0000 1.2 +++ keep_an_eye_on.txt 5 Apr 2005 12:12:02 -0000 1.3 @@ -30,3 +30,8 @@ - schedule_timeout(30*HZ/100); + msleep(300); +- Apr 5, 2005: __iomem markers + The result of ioremap() and pci_iomap() etc. shall be assigned to variables + like "void __iomem *ioaddr;". This helps the "sparse" tool to find + pointer access errors. + |
|
From: Jan-Benedict G. <jb...@us...> - 2005-04-05 11:49:58
|
Update of /cvsroot/linux-vax/kernel-2.5/Documentation/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28221 Modified Files: keep_an_eye_on.txt Log Message: - Mention msleep() transition. Index: keep_an_eye_on.txt =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Documentation/vax/keep_an_eye_on.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- keep_an_eye_on.txt 8 Mar 2005 08:26:55 -0000 1.1 +++ keep_an_eye_on.txt 5 Apr 2005 11:49:50 -0000 1.2 @@ -4,6 +4,9 @@ function deprecation, ...) please add a note here so that in can be revised later on. +- Mar 4, 2005: "Re: [PATCH] new driver for ITM Touch touchscreen" + Use input_set_abs_params() to set the coordinate range for the digitizer. + - Mar 4, 2005, "[PATCH][0/10] verify_area cleanup" Check if we're using verify_area() anywhere and change it over to access_ok(): @@ -20,3 +23,10 @@ to something like the struct driver thing. lkkbd.c and vsxxxaa.c may need checking. +- Apr 5, 2005: set_current_state()/schedule_timeout() -> msleep() + Not related to a specific mailing list post, but all code that possibly + waits using schedule_timeout() should probably changed like this: + - set_current_state(TASK_UNINTERRUPTIBLE); + - schedule_timeout(30*HZ/100); + + msleep(300); + |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:40:13
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30522/arch/vax Modified Files: defconfig Log Message: Update defconfig for 2.6.11 Index: defconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/defconfig,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- defconfig 26 Mar 2005 22:14:41 -0000 1.20 +++ defconfig 28 Mar 2005 16:39:51 -0000 1.21 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.10 -# Mon Mar 21 23:45:17 2005 +# Linux kernel version: 2.6.11 +# Mon Mar 28 17:07:39 2005 # CONFIG_VAX=y CONFIG_MMU=y @@ -12,6 +12,7 @@ CONFIG_KCORE_ELF=y # CONFIG_I2C is not set # CONFIG_I2C_ALGOBIT is not set +CONFIG_GENERIC_CALIBRATE_DELAY=y # CONFIG_PREEMPT is not set CONFIG_CMDLINE="root=/dev/nfs ip=bootp rw debug" CONFIG_EARLY_PRINTK=y @@ -100,6 +101,7 @@ # CONFIG_SERIO_I8042 is not set CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set +# CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set # @@ -156,7 +158,6 @@ # # Ftape, the floppy tape device driver # -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_RAW_DRIVER is not set @@ -177,6 +178,7 @@ # Block devices # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_COW_COMMON is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_RAM is not set @@ -191,6 +193,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +# CONFIG_ATA_OVER_ETH is not set # # Networking support @@ -287,6 +290,11 @@ # CONFIG_NET_RADIO is not set # +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# # Wan interfaces # # CONFIG_WAN is not set @@ -330,6 +338,7 @@ # CONFIG_SCSI_SPI_ATTRS=y # CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set # # SCSI low-level drivers @@ -352,6 +361,10 @@ # CONFIG_JBD is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set + +# +# XFS support +# # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -414,7 +427,6 @@ # CONFIG_NFSD is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y -# CONFIG_EXPORTFS is not set CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set @@ -454,6 +466,7 @@ # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set # @@ -487,6 +500,10 @@ # CONFIG_CRYPTO is not set # +# Hardware crypto devices +# + +# # Multimedia devices # # CONFIG_VIDEO_DEV is not set |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:39:07
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29480/include/asm-vax/mm Modified Files: pgtable.h Log Message: Include placeholders for PUD definitions for 4-level pagetables Index: pgtable.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pgtable.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pgtable.h 1 Mar 2004 00:37:45 -0000 1.11 +++ pgtable.h 28 Mar 2005 16:38:57 -0000 1.12 @@ -13,6 +13,8 @@ #include <asm/mtpr.h> +/* FIXME: we should really use <asm-generic/pgtable-nopmd.h> */ +#include <asm-generic/4level-fixup.h> /* the pagelet stuff */ #include <asm/mm/pgtable_pagelet.h> |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:37:21
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29191/include/asm-vax/mm Modified Files: pagelet_pgprot.h pagelet_pte.h Log Message: Implement pte_read() Index: pagelet_pgprot.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pagelet_pgprot.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pagelet_pgprot.h 20 May 2002 00:33:39 -0000 1.3 +++ pagelet_pgprot.h 28 Mar 2005 16:36:59 -0000 1.4 @@ -58,7 +58,7 @@ #define _PAGE_CHG_MASK (_PFN_MASK | _PAGE_ACCESSED | _PAGE_DIRTY) -/*#define PAGE_PROT_MASK (0x1e000000)*/ +#define PAGE_PROT_MASK 0x78000000 #define PAGE_NONE __pgprot(_PAGE_VALID | _PAGE_ACCESSED) #define PAGE_SHARED __pgprot(_PAGE_VALID | _PAGE_ACCESSED | _PAGE_UW ) Index: pagelet_pte.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pagelet_pte.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pagelet_pte.h 26 Aug 2003 23:20:39 -0000 1.6 +++ pagelet_pte.h 28 Mar 2005 16:37:00 -0000 1.7 @@ -1,5 +1,6 @@ #ifndef _VAX_MM_PAGELET_PTE_H #define _VAX_MM_PAGELET_PTE_H + /* * pagelet_pte.h * @@ -233,6 +234,12 @@ return pte; } +static inline int pte_read(pte_t pte) +{ + /* If the page protection is non-zero, page is always kernel readable */ + return (pte_val(pte) & PAGE_PROT_MASK); +} + static inline int pte_write(pte_t pte) { return !(pte_val(pte) & _PAGE_RO); |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:28:33
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25684/include/asm-vax/mm Modified Files: pagelet_pgd.h Log Message: Add parentheses around macro arguments Index: pagelet_pgd.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pagelet_pgd.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pagelet_pgd.h 26 Aug 2003 23:12:14 -0000 1.5 +++ pagelet_pgd.h 28 Mar 2005 16:28:23 -0000 1.6 @@ -54,7 +54,7 @@ /* to set the page-dir (p0br/p0lr) (p1br/p1lr) see arch/vax/mm/pgtable.c */ extern void set_page_dir(struct task_struct *task, pgd_t *pgdir); #define SET_PAGE_DIR( tsk, pgdir) \ - set_page_dir( tsk, pgdir) + set_page_dir( (tsk), (pgdir)) @@ -68,12 +68,12 @@ * this macro returns the index of the entry in the pgd page which would * control the given virtual address */ -#define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) +#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD-1)) /* * a shortcut which implies the use of the kernel's pgd, instead * of a process's */ -#define pgd_offset_k(address) pgd_offset(&init_mm, address) +#define pgd_offset_k(address) pgd_offset(&init_mm, (address)) #endif |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:27:58
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25238/include/asm-vax Modified Files: thread_info.h Log Message: Define TIF_MEMDIE, required by 2.6.11 Index: thread_info.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/thread_info.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- thread_info.h 3 Jun 2004 21:37:55 -0000 1.5 +++ thread_info.h 28 Mar 2005 16:27:50 -0000 1.6 @@ -103,6 +103,7 @@ #define TIF_NOTIFY_RESUME 1 /* resumption notification requested */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ +#define TIF_MEMDIE 4 #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:27:32
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25107/include/asm-vax Modified Files: bitops.h Log Message: Make first argument of find_next_zero_bit() const Index: bitops.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/bitops.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- bitops.h 28 Feb 2005 22:14:56 -0000 1.18 +++ bitops.h 28 Mar 2005 16:27:23 -0000 1.19 @@ -409,7 +409,7 @@ */ extern __inline__ unsigned long -find_next_zero_bit(void * addr, unsigned long size, unsigned long offset) +find_next_zero_bit(const void * addr, unsigned long size, unsigned long offset) { unsigned int * p = ((unsigned int *) addr) + (offset >> 5); unsigned int result = offset & ~31UL; |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:27:02
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/vax/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24936/drivers/vax/char Modified Files: dz.c Log Message: save_flags(), cli() and restore_flags are deprecated Index: dz.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/vax/char/dz.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- dz.c 22 Mar 2005 09:20:12 -0000 1.2 +++ dz.c 28 Mar 2005 16:26:54 -0000 1.3 @@ -1312,7 +1312,7 @@ /* FIXME: check this for NULL */ base_addr = (unsigned long) ioremap(vsbus_dev->phys_base, 16); - save_flags(flags); cli(); + local_irq_save(flags); for (i=0; i < DZ_NB_PORT; i++) { info = &multi[i]; lines[i] = info; @@ -1393,7 +1393,7 @@ * Order matters here... the trick is that flags is updated... in * request_irq - to immediatedly obliterate it is unwise. */ - restore_flags(flags); + local_irq_restore(flags); /* The bus-specific IRQ we are handed in the vsbus_dev * structure is the TX interrupt. The RX is always the |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:26:24
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24554/arch/vax/kernel Modified Files: interrupt.c Log Message: Use local_irq_save/restore instead of the deprecated save_and_cli and restore_flags Index: interrupt.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/interrupt.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- interrupt.c 30 Sep 2004 21:19:02 -0000 1.27 +++ interrupt.c 28 Mar 2005 16:26:14 -0000 1.28 @@ -420,13 +420,13 @@ irq_enter(); - save_and_cli(flags); + local_irq_save(flags); dispatch_irq(regs, vec); irq_exit(); - restore_flags(flags); - if (softirq_pending(smp_processor_id())) { + local_irq_restore(flags); + if (local_softirq_pending()) { do_softirq(); } } @@ -450,7 +450,7 @@ void do_irq_excep(struct pt_regs *regs, void *inside_vec, void *excep_info) { struct irqvector *vec; - int cpu; + vec = (struct irqvector *)(inside_vec - offsetof(struct irqvector, excep_info_size)); @@ -471,18 +471,14 @@ } ret_from_sys_call: - cpu = smp_processor_id(); - if (softirq_pending(cpu)) { -// if (softirq_active(cpu)&softirq_mask(cpu)) { + if (local_softirq_pending()) { do_softirq(); goto ret_from_intr; } goto ret_with_reschedule; ret_from_exception: - cpu = smp_processor_id(); - if (softirq_pending(cpu)) { -// if (softirq_active(cpu)&softirq_mask(cpu)) { + if (local_softirq_pending()) { do_softirq(); } @@ -523,17 +519,17 @@ int flags; struct irqvector *vec; - save_and_cli(flags); + local_irq_save(flags); for (i=0, vec=irqvectors; i<NR_IRQVECTORS; i++, vec++) { if (vec->dest_addr == NULL) { vec->dest_addr = (void *)0xffffffff; - restore_flags(flags); + local_irq_restore(flags); return vec; } } - restore_flags(flags); + local_irq_restore(flags); return NULL; } @@ -565,10 +561,10 @@ int flags; extern void irqvec_handler(void); - save_and_cli(flags); + local_irq_save(flags); if (!scb_vec_free(vec_num)) { - restore_flags(flags); + local_irq_restore(flags); printk("hook_scb_vector: SCB vector %04x (%p) already in use\n", vec_num, SCB_VECTOR(vec_num)); return -EBUSY; @@ -594,7 +590,7 @@ flush_icache(); - restore_flags(flags); + local_irq_restore(flags); return 0; } @@ -638,10 +634,10 @@ struct irqvector *vector; unsigned char *inside_vec; - save_and_cli(flags); + local_irq_save(flags); if (scb_vec_free(vec_num)) { - restore_flags(flags); + local_irq_restore(flags); printk("unhook_scb_vector: SCB vector %04x already free\n", vec_num); return; } @@ -657,7 +653,7 @@ offsetof(struct irqvector, inst_jsb)); if (dev_id != vector->action.dev_id) { - restore_flags(flags); + local_irq_restore(flags); printk("unhook_scb_vector: dev_id mismatch (expected %p, currently %p)\n", dev_id, vector->action.dev_id); return; @@ -665,7 +661,7 @@ SCB_VECTOR(vec_num) = vector->orig_scb_vector; - restore_flags(flags); + local_irq_restore(flags); free_irqvector(vector); } @@ -683,13 +679,13 @@ int i; int flags; - save_and_cli(flags); + local_irq_save(flags); for (i = FIRST_ADAPTER_VECTOR; i < NR_IRQS; i++) stray_handlers[i].flags &= ~STRAY_EXCEPTION_FIRED; autoprobing=1; - restore_flags(flags); + local_irq_restore(flags); return 1; } @@ -704,7 +700,7 @@ nr_vecs = 0; vec_found = 0; - save_and_cli(flags); + local_irq_save(flags); for (i = FIRST_ADAPTER_VECTOR; i < NR_IRQS; i++) { if (stray_handlers[i].flags & STRAY_EXCEPTION_FIRED) { @@ -713,7 +709,7 @@ } } autoprobing=0; - restore_flags(flags); + local_irq_restore(flags); if (nr_vecs > 1) { vec_found = -vec_found; |
|
From: Kenn H. <ke...@us...> - 2005-03-28 16:20:06
|
Update of /cvsroot/linux-vax/kernel-2.5/arch/vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21324/arch/vax Modified Files: Kconfig Log Message: Add CONFIG_GENERIC_CALIBRATE_DELAY Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/Kconfig,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Kconfig 30 Sep 2004 21:08:44 -0000 1.22 +++ Kconfig 28 Mar 2005 16:19:57 -0000 1.23 @@ -48,6 +48,10 @@ default n # End I2C placeholders +config GENERIC_CALIBRATE_DELAY + bool + default y + config PREEMPT bool "Preemptible kernel (currently broken)" default n |
|
From: Kenn H. <ke...@us...> - 2005-03-28 01:06:48
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23000/include/asm-vax Modified Files: hardirq.h Log Message: irq_enter and irq_exit move to <linux/hardirq.h> in 2.6.11 Index: hardirq.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/hardirq.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- hardirq.h 17 Nov 2004 09:25:25 -0000 1.8 +++ hardirq.h 28 Mar 2005 01:06:24 -0000 1.9 @@ -47,10 +47,4 @@ # error HARDIRQ_BITS is too low! #endif -#define irq_enter() (preempt_count() += HARDIRQ_OFFSET) - - -/* FIXME: implement irq_exit() properly when we do CONFIG_PREEMPT */ -#define irq_exit() (preempt_count() -= HARDIRQ_OFFSET) - #endif /* _ASM_VAX_HARDIRQ_H */ |
|
From: Kenn H. <ke...@us...> - 2005-03-28 00:33:39
|
Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4820/include/asm-vax Added Files: cputime.h Log Message: 2.6.11 needs <asm/cputime.h> --- NEW FILE: cputime.h --- #ifndef __VAX_CPUTIME_H #define __VAX_CPUTIME_H #include <asm-generic/cputime.h> #endif /* __VAX_CPUTIME_H */ |
|
From: Kenn H. <ke...@us...> - 2005-03-28 00:01:12
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/input/mouse In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers/input/mouse Modified Files: vsxxxaa.c Log Message: Merge with 2.6.11 Index: vsxxxaa.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/input/mouse/vsxxxaa.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- vsxxxaa.c 25 Feb 2005 18:13:46 -0000 1.25 +++ vsxxxaa.c 28 Mar 2005 00:01:01 -0000 1.26 @@ -85,7 +85,7 @@ #include <linux/serio.h> #include <linux/init.h> -#define DRIVER_DESC "Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet" +#define DRIVER_DESC "Driver for DEC VSXXX-AA and -GA mice and VSXXX-AB tablet" MODULE_AUTHOR ("Jan-Benedict Glaw <jb...@lu...>"); MODULE_DESCRIPTION (DRIVER_DESC); |
|
From: Kenn H. <ke...@us...> - 2005-03-28 00:01:11
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/video/logo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers/video/logo Modified Files: Kconfig Log Message: Merge with 2.6.11 Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/logo/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Kconfig 10 Mar 2004 10:19:43 -0000 1.2 +++ Kconfig 28 Mar 2005 00:01:02 -0000 1.3 @@ -25,7 +25,7 @@ config LOGO_DEC_CLUT224 bool "224-color Digital Equipment Corporation Linux logo" - depends on LOGO && (DECSTATION || VAX) + depends on LOGO && (MACH_DECSTATION || VAX) default y config LOGO_MAC_CLUT224 |
|
From: Kenn H. <ke...@us...> - 2005-03-28 00:01:11
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/char In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers/char Modified Files: keyboard.c Log Message: Merge with 2.6.11 Index: keyboard.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/keyboard.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- keyboard.c 17 Nov 2004 00:18:31 -0000 1.3 +++ keyboard.c 28 Mar 2005 00:01:01 -0000 1.4 @@ -31,7 +31,6 @@ #include <linux/tty_flip.h> #include <linux/mm.h> #include <linux/string.h> -#include <linux/random.h> #include <linux/init.h> #include <linux/slab.h> @@ -199,6 +198,8 @@ if (scancode < 0 || scancode >= dev->keycodemax) return -EINVAL; + if (keycode < 0 || keycode > KEY_MAX) + return -EINVAL; oldkey = SET_INPUT_KEYCODE(dev, scancode, keycode); @@ -330,7 +331,7 @@ * in utf-8 already. UTF-8 is defined for words of up to 31 bits, * but we need only 16 bits here */ -void to_utf8(struct vc_data *vc, ushort c) +static void to_utf8(struct vc_data *vc, ushort c) { if (c < 0x80) /* 0******* */ @@ -392,7 +393,7 @@ * Otherwise, conclude that DIACR was not combining after all, * queue it and return CH. */ -unsigned char handle_diacr(struct vc_data *vc, unsigned char ch) +static unsigned char handle_diacr(struct vc_data *vc, unsigned char ch) { int d = diacr; int i; @@ -853,18 +854,6 @@ set_leds(); } -void register_leds(struct kbd_struct *kbd, unsigned int led, - unsigned int *addr, unsigned int mask) -{ - if (led < 3) { - ledptrs[led].addr = addr; - ledptrs[led].mask = mask; - ledptrs[led].valid = 1; - kbd->ledmode = LED_SHOW_MEM; - } else - kbd->ledmode = LED_SHOW_FLAGS; -} - static inline unsigned char getleds(void) { struct kbd_struct *kbd = kbd_table + fg_console; @@ -925,7 +914,7 @@ /* * This allows a newly plugged keyboard to pick the LED state. */ -void kbd_refresh_leds(struct input_handle *handle) +static void kbd_refresh_leds(struct input_handle *handle) { unsigned char leds = ledstate; @@ -939,7 +928,11 @@ tasklet_enable(&keyboard_tasklet); } -#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) || defined (CONFIG_VAX) +#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ + defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC32) ||\ + defined(CONFIG_SPARC64) || defined(CONFIG_PARISC) || defined(CONFIG_SUPERH) ||\ + defined(CONFIG_VAX) ||\ + (defined(CONFIG_ARM) && defined(CONFIG_KEYBOARD_ATKBD) && !defined(CONFIG_RPC)) #define HW_RAW(dev) (test_bit(EV_MSC, dev->evbit) && test_bit(MSC_RAW, dev->mscbit) &&\ ((dev)->id.bustype == BUS_I8042) && ((dev)->id.vendor == 0x0001) && ((dev)->id.product == 0x0001)) @@ -1024,7 +1017,7 @@ } #endif -void kbd_rawcode(unsigned char data) +static void kbd_rawcode(unsigned char data) { struct vc_data *vc = vc_cons[fg_console].d; kbd = kbd_table + fg_console; @@ -1040,9 +1033,6 @@ struct tty_struct *tty; int shift_final; - if (down != 2) - add_keyboard_randomness((keycode << 1) ^ down); - tty = vc->vc_tty; if (tty && (!tty->driver_data)) { |
|
From: Kenn H. <ke...@us...> - 2005-03-28 00:01:09
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20011/drivers Modified Files: Makefile Log Message: Merge with 2.6.11 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/Makefile,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- Makefile 21 Mar 2005 23:44:08 -0000 1.32 +++ Makefile 28 Mar 2005 00:00:57 -0000 1.33 @@ -42,6 +42,7 @@ obj-$(CONFIG_SBUS) += sbus/ obj-$(CONFIG_ZORRO) += zorro/ obj-$(CONFIG_MAC) += macintosh/ +obj-$(CONFIG_ATA_OVER_ETH) += block/aoe/ obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_USB) += usb/ @@ -57,9 +58,11 @@ obj-$(CONFIG_ISDN) += isdn/ obj-$(CONFIG_MCA) += mca/ obj-$(CONFIG_EISA) += eisa/ +obj-$(CONFIG_VAX) += vax/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ +obj-$(CONFIG_INFINIBAND) += infiniband/ obj-y += firmware/ +obj-$(CONFIG_CRYPTO) += crypto/ # VAX-specific stuff -obj-$(CONFIG_VAX) += vax/ |
|
From: Kenn H. <ke...@us...> - 2005-03-27 23:47:27
|
Update of /cvsroot/linux-vax/kernel-2.5/init In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986/init Modified Files: Makefile Kconfig Log Message: Merge with 2.6.11 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/init/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 21 Mar 2005 18:58:04 -0000 1.3 +++ Makefile 27 Mar 2005 23:46:45 -0000 1.4 @@ -3,6 +3,8 @@ # obj-y := main.o version.o mounts.o initramfs.o +obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o + mounts-y := do_mounts.o mounts-$(CONFIG_DEVFS_FS) += do_mounts_devfs.o mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/init/Kconfig,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Kconfig 21 Mar 2005 23:44:18 -0000 1.3 +++ Kconfig 27 Mar 2005 23:46:45 -0000 1.4 @@ -206,20 +206,9 @@ bool "Support for hot-pluggable devices" if !ARCH_S390 default ARCH_S390 help - Say Y here if you want to plug devices into your computer while - the system is running, and be able to use them quickly. In many - cases, the devices can likewise be unplugged at any time too. - - One well known example of this is PCMCIA- or PC-cards, credit-card - size devices such as network cards, modems or hard drives which are - plugged into slots found on all modern laptop computers. Another - example, used on modern desktops as well as laptops, is USB. - - Enable HOTPLUG and KMOD, and build a modular kernel. Get agent - software (at <http://linux-hotplug.sourceforge.net/>) and install it. - Then your kernel will automatically call out to a user mode "policy - agent" (/sbin/hotplug) to load modules and set up software needed - to use devices as you hotplug them. + This option is provided for the case where no in-kernel-tree + modules require HOTPLUG functionality, but a module built + outside the kernel tree does. Such modules require Y here. config KOBJECT_UEVENT bool "Kernel Userspace Events" @@ -327,8 +316,9 @@ If unsure, say N. config SHMEM + bool "Use full shmem filesystem" if EMBEDDED default y - bool "Use full shmem filesystem" if EMBEDDED && MMU + depends on MMU help The shmem is an internal filesystem used to manage shared memory. It is backed by swap and manages resource limits. It is also exported @@ -431,7 +421,7 @@ config MODVERSIONS bool "Module versioning support (EXPERIMENTAL)" - depends on MODULES && EXPERIMENTAL + depends on MODULES && EXPERIMENTAL && !USERMODE help Usually, you have to use modules compiled with your kernel. Saying Y here makes it sometimes possible to use modules |
|
From: Kenn H. <ke...@us...> - 2005-03-27 23:47:04
|
Update of /cvsroot/linux-vax/kernel-2.5/drivers/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986/drivers/video Modified Files: Kconfig Makefile fbmem.c Log Message: Merge with 2.6.11 Index: fbmem.c =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/fbmem.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- fbmem.c 21 Mar 2005 23:44:11 -0000 1.10 +++ fbmem.c 27 Mar 2005 23:46:47 -0000 1.11 @@ -35,6 +35,7 @@ #include <linux/err.h> #include <linux/kernel.h> #include <linux/device.h> +#include <linux/efi.h> #if defined(__mc68000__) || defined(CONFIG_APUS) #include <asm/setup.h> @@ -716,8 +717,9 @@ if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) { struct fb_videomode mode; - info->var = *var; + int err = 0; + info->var = *var; if (info->fbops->fb_set_par) info->fbops->fb_set_par(info); @@ -729,15 +731,16 @@ if (info->modelist.prev && info->modelist.next && !list_empty(&info->modelist)) - fb_add_videomode(&mode, &info->modelist); + err = fb_add_videomode(&mode, &info->modelist); - if (info->flags & FBINFO_MISC_MODECHANGEUSER) { + if (!err && info->flags & FBINFO_MISC_USEREVENT) { struct fb_event event; - info->flags &= ~FBINFO_MISC_MODECHANGEUSER; + info->flags &= ~FBINFO_MISC_USEREVENT; event.info = info; notifier_call_chain(&fb_notifier_list, - FB_EVENT_MODE_CHANGE, &event); + FB_EVENT_MODE_CHANGE, + &event); } } } @@ -747,15 +750,23 @@ int fb_blank(struct fb_info *info, int blank) { - int err = -EINVAL; - + int ret = -EINVAL; + if (blank > FB_BLANK_POWERDOWN) blank = FB_BLANK_POWERDOWN; if (info->fbops->fb_blank) - err = info->fbops->fb_blank(blank, info); + ret = info->fbops->fb_blank(blank, info); - return err; + if (!ret) { + struct fb_event event; + + event.info = info; + event.data = ␣ + notifier_call_chain(&fb_notifier_list, FB_EVENT_BLANK, &event); + } + + return ret; } static int @@ -783,9 +794,9 @@ if (copy_from_user(&var, argp, sizeof(var))) return -EFAULT; acquire_console_sem(); - info->flags |= FBINFO_MISC_MODECHANGEUSER; + info->flags |= FBINFO_MISC_USEREVENT; i = fb_set_var(info, &var); - info->flags &= ~FBINFO_MISC_MODECHANGEUSER; + info->flags &= ~FBINFO_MISC_USEREVENT; release_console_sem(); if (i) return i; if (copy_to_user(argp, &var, sizeof(var))) @@ -847,7 +858,9 @@ &event); case FBIOBLANK: acquire_console_sem(); + info->flags |= FBINFO_MISC_USEREVENT; i = fb_blank(info, arg); + info->flags &= ~FBINFO_MISC_USEREVENT; release_console_sem(); return i; default: @@ -857,6 +870,23 @@ } } +#ifdef CONFIG_COMPAT +static long +fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + int fbidx = iminor(file->f_dentry->d_inode); + struct fb_info *info = registered_fb[fbidx]; + struct fb_ops *fb = info->fbops; + int ret; + if (fb->fb_compat_ioctl == NULL) + return -ENOIOCTLCMD; + lock_kernel(); + ret = fb->fb_compat_ioctl(file, cmd, arg, info); + unlock_kernel(); + return ret; +} +#endif + static int fb_mmap(struct file *file, struct vm_area_struct * vma) { @@ -939,8 +969,13 @@ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); #elif defined(__hppa__) pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; -#elif defined(__ia64__) || defined(__arm__) || defined(__sh__) +#elif defined(__arm__) || defined(__sh__) || defined(__m32r__) vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); +#elif defined(__ia64__) + if (efi_range_is_wc(vma->vm_start, vma->vm_end - vma->vm_start)) + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); + else + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); #else #warning What do we have to do here?? #endif @@ -997,6 +1032,9 @@ .read = fb_read, .write = fb_write, .ioctl = fb_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = fb_compat_ioctl, +#endif .mmap = fb_mmap, .open = fb_open, .release = fb_release, @@ -1167,7 +1205,7 @@ } return 0; } -module_init(fbmem_init); +subsys_initcall(fbmem_init); static char *video_options[FB_MAX]; static int ofonly; @@ -1225,19 +1263,32 @@ * */ +extern const char *global_mode_option; + int __init video_setup(char *options) { - int i; + int i, global = 0; if (!options || !*options) - return 0; + global = 1; + + if (!global && !strncmp(options, "ofonly", 6)) { + ofonly = 1; + global = 1; + } + + if (!global && !strstr(options, "fb:")) { + global_mode_option = options; + global = 1; + } + + if (!global) { + for (i = 0; i < FB_MAX; i++) { + if (video_options[i] == NULL) { + video_options[i] = options; + break; + } - for (i = 0; i < FB_MAX; i++) { - if (!strncmp(options, "ofonly", 6)) - ofonly = 1; - if (video_options[i] == NULL) { - video_options[i] = options; - break; } } Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 21 Mar 2005 23:44:10 -0000 1.10 +++ Makefile 27 Mar 2005 23:46:47 -0000 1.11 @@ -6,6 +6,7 @@ obj-$(CONFIG_VT) += console/ obj-$(CONFIG_LOGO) += logo/ +obj-$(CONFIG_SYSFS) += backlight/ obj-$(CONFIG_FB) += fbmem.o fbmon.o fbcmap.o fbsysfs.o modedb.o softcursor.o # Only include macmodes.o if we have FB support and are PPC @@ -81,12 +82,8 @@ obj-$(CONFIG_FB_SA1100) += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_SUN3) += sun3fb.o obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbimgblt.o -obj-$(CONFIG_FB_TX3912) += tx3912fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o -obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o -obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o -obj-$(CONFIG_FB_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_68328) += 68328fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o @@ -94,6 +91,13 @@ obj-$(CONFIG_FB_CIRRUS) += cirrusfb.o cfbfillrect.o cfbimgblt.o cfbcopyarea.o obj-$(CONFIG_FB_ASILIANT) += asiliantfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_PXA) += pxafb.o cfbimgblt.o cfbcopyarea.o cfbfillrect.o +obj-$(CONFIG_FB_W100) += w100fb.o cfbimgblt.o cfbcopyarea.o cfbfillrect.o +obj-$(CONFIG_FB_AU1100) += au1100fb.o fbgen.o +obj-$(CONFIG_FB_PMAG_AA) += pmag-aa-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o +obj-$(CONFIG_FB_TX3912) += tx3912fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VAXLCG) += vaxlcgfb.o cfbcopyarea.o cfbfillrect.o cfbimgblt.o Index: Kconfig =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/video/Kconfig,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Kconfig 21 Mar 2005 23:44:09 -0000 1.13 +++ Kconfig 27 Mar 2005 23:46:47 -0000 1.14 @@ -581,7 +581,7 @@ packed pixel and 32 bpp packed pixel. You can also use font widths different from 8. -config FB_MATROX_G450 +config FB_MATROX_G bool "G100/G200/G400/G450/G550 support" depends on FB_MATROX ---help--- @@ -592,10 +592,10 @@ different from 8. If you need support for G400 secondary head, you must first say Y to - "I2C support" and "I2C bit-banging support" in the character devices - section, and then to "Matrox I2C support" and "G400 second head - support" here in the framebuffer section. G450/G550 secondary head - and digital output are supported without additional modules. + "I2C support" in the character devices section, and then to + "Matrox I2C support" and "G400 second head support" here in the + framebuffer section. G450/G550 secondary head and digital output + are supported without additional modules. The driver starts in monitor mode. You must use the matroxset tool (available at <ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/>) to @@ -612,26 +612,6 @@ G450/G550 hardware can display TV picture only from secondary CRTC, and it performs no scaling, so picture must have 525 or 625 lines. -config FB_MATROX_G100A - bool "G100/G200/G400 support" - depends on FB_MATROX && !FB_MATROX_G450 - ---help--- - Say Y here if you have a Matrox G100, G200 or G400 based - video card. If you select "Advanced lowlevel driver options", you - should check 8 bpp packed pixel, 16 bpp packed pixel, 24 bpp packed - pixel and 32 bpp packed pixel. You can also use font widths - different from 8. - - If you need support for G400 secondary head, you must first say Y to - "I2C support" and "I2C bit-banging support" in the character devices - section, and then to "Matrox I2C support" and "G400 second head - support" here in the framebuffer section. - -config FB_MATROX_G100 - bool - depends on FB_MATROX && (FB_MATROX_G450 || FB_MATROX_G100A) - default y - config FB_MATROX_I2C tristate "Matrox I2C support" depends on FB_MATROX && I2C @@ -651,7 +631,7 @@ config FB_MATROX_MAVEN tristate "G400 second head support" - depends on FB_MATROX_G100 && FB_MATROX_I2C + depends on FB_MATROX_G && FB_MATROX_I2C ---help--- WARNING !!! This support does not work with G450 !!! @@ -843,7 +823,7 @@ depends on FB && PCI help This is the frame buffer device driver for the SiS 300, 315 and - 330 series VGA chipsets. Specs available at http://www.sis.com + 330 series VGA chipsets. Specs available at <http://www.sis.com> To compile this driver as a module, choose M here; the module will be called sisfb. @@ -912,7 +892,7 @@ WARNING: Do not use any application that uses the 3D engine (namely glide) while using this driver. - Please read the file Documentation/fb/README-sstfb.txt for supported + Please read the <file:Documentation/fb/README-sstfb.txt> for supported options and other important info support. config FB_TRIDENT @@ -946,6 +926,42 @@ similar boards, 3DLabs Permedia3 Create!, Appian Jeronimo 2000 and maybe other boards. +config FB_E1356 + tristate "Epson SED1356 framebuffer support" + depends on FB && EXPERIMENTAL && PCI && MIPS + +config PB1000_CRT + bool "Use CRT on Pb1000 (J65)" + depends on MIPS_PB1000=y && FB_E1356 + +config PB1000_NTSC + bool "Use Compsite NTSC on Pb1000 (J63)" + depends on MIPS_PB1000=y && FB_E1356 + +config PB1000_TFT + bool "Use TFT Panel on Pb1000 (J64)" + depends on MIPS_PB1000=y && FB_E1356 + +config PB1500_CRT + bool "Use CRT on Pb1500 " if MIPS_PB1500=y + depends on FB_E1356 + +config PB1500_CRT + prompt "Use CRT on Pb1100 " + depends on FB_E1356 && MIPS_PB1100=y + +config PB1500_TFT + bool "Use TFT Panel on Pb1500 " if MIPS_PB1500=y + depends on FB_E1356 + +config PB1500_TFT + prompt "Use TFT Panel on Pb1100 " + depends on FB_E1356 && MIPS_PB1100=y + +config FB_AU1100 + bool "Au1100 LCD Driver" + depends on FB && EXPERIMENTAL && PCI && MIPS && MIPS_PB1100=y + config FB_SBUS bool "SBUS and UPA framebuffers" depends on FB && (SPARC32 || SPARC64) @@ -1005,29 +1021,35 @@ This is the frame buffer device driver for the Hitachi HD64461 LCD frame buffer card. +config FB_PMAG_AA + bool "PMAG-AA TURBOchannel framebuffer support" + depends on FB && MACH_DECSTATION && TC + help + Support for the PMAG-AA TURBOchannel framebuffer card (1280x1024x1) + used mainly in the MIPS-based DECstation series. + config FB_PMAG_BA bool "PMAG-BA TURBOchannel framebuffer support" - depends on FB && DECSTATION && TC + depends on FB && MACH_DECSTATION && TC help - Say Y here to directly support the on-board PMAG-BA framebuffer in - the 5000/1xx versions of the DECstation. There is a page dedicated - to Linux on DECstations at <http://decstation.unix-ag.org/>. + Support for the PMAG-BA TURBOchannel framebuffer card (1024x864x8) + used mainly in the MIPS-based DECstation series. config FB_PMAGB_B - bool "PMAGB-B TURBOchannel framebuffer spport" - depends on FB && DECSTATION && TC + bool "PMAGB-B TURBOchannel framebuffer support" + depends on FB && MACH_DECSTATION && TC help - Say Y here to directly support the on-board PMAGB-B framebuffer in - the 5000/1xx versions of the DECstation. There is a page dedicated - to Linux on DECstations at <http://decstation.unix-ag.org/>. + Support for the PMAGB-B TURBOchannel framebuffer card used mainly + in the MIPS-based DECstation series. The card is currently only + supported in 1280x1024x8 mode. config FB_MAXINE - bool "Maxine (Personal DECstation) onboard framebuffer spport" - depends on FB && DECSTATION && TC + bool "Maxine (Personal DECstation) onboard framebuffer support" + depends on FB && MACH_DECSTATION && TC help - Say Y here to directly support the on-board framebuffer in the - Maxine (5000/20, /25, /33) version of the DECstation. There is a - page dedicated to Linux on DECstations at <http://decstation.unix-ag.org/>. + Support for the onboard framebuffer (1024x768x8) in the Personal + DECstation series (Personal DECstation 5000/20, /25, /33, /50, + Codename "Maxine"). config FB_TX3912 bool "TMPTX3912/PR31700 frame buffer support" @@ -1038,6 +1060,13 @@ Say Y here to enable kernel support for the on-board framebuffer. +config FB_G364 + bool + depends on MIPS_MAGNUM_4000 || OLIVETTI_M700 + help + The G364 driver is the framebuffer used in MIPS Magnum 4000 and + Olivetti M700-10 systems. + config FB_68328 bool "Motorola 68328 native frame buffer support" depends on (M68328 || M68EZ328 || M68VZ328) @@ -1059,6 +1088,19 @@ If unsure, say N. +config FB_W100 + tristate "W100 frame buffer support" + depends on FB && PXA_SHARPSL + ---help--- + Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. + + This driver is also available as a module ( = code which can be + inserted and removed from the running kernel whenever you want). The + module will be called vfb. If you want to compile it as a module, + say M here and read <file:Documentation/modules.txt>. + + If unsure, say N. + config FB_PXA_PARAMETERS bool "PXA LCD command line parameters" default n @@ -1074,7 +1116,7 @@ single model of flatpanel then you can safely leave this option disabled. - Documentation/fb/pxafb.txt describes the available parameters. + <file:Documentation/fb/pxafb.txt> describes the available parameters. config FB_VIRTUAL tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)" @@ -1101,5 +1143,9 @@ source "drivers/video/logo/Kconfig" endif +if FB && SYSFS + source "drivers/video/backlight/Kconfig" +endif + endmenu |
|
From: Kenn H. <ke...@us...> - 2005-03-27 23:47:03
|
Update of /cvsroot/linux-vax/kernel-2.5 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986 Modified Files: Makefile Log Message: Merge with 2.6.11 Index: Makefile =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- Makefile 21 Mar 2005 23:40:31 -0000 1.109 +++ Makefile 27 Mar 2005 23:46:46 -0000 1.110 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 10 +SUBLEVEL = 11 EXTRAVERSION = NAME=Woozy Numbat @@ -149,14 +149,13 @@ # careful not to include files twice if building in the source # directory. LOCALVERSION from the command line override all of this -ifeq ($(objtree),$(srctree)) -localversion-files := $(wildcard $(srctree)/localversion*) -else -localversion-files := $(wildcard $(objtree)/localversion* $(srctree)/localversion*) -endif +localver := $(objtree)/localversion* $(srctree)/localversion* +localver := $(sort $(wildcard $(localver))) +# skip backup files (containing '~') +localver := $(foreach f, $(localver), $(if $(findstring ~, $(f)),,$(f))) LOCALVERSION = $(subst $(space),, \ - $(shell cat /dev/null $(localversion-files:%~=)) \ + $(shell cat /dev/null $(localver)) \ $(patsubst "%",%,$(CONFIG_LOCALVERSION))) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION) @@ -291,7 +290,7 @@ $(call cc-option, $(1),$(2)) # cc-option-yn -# Usage: flag := $(call gcc-option-yn, -march=winchip-c6) +# Usage: flag := $(call cc-option-yn, -march=winchip-c6) cc-option-yn = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ > /dev/null 2>&1; then echo "y"; else echo "n"; fi;) @@ -331,7 +330,10 @@ KALLSYMS = scripts/kallsyms PERL = perl CHECK = sparse + +NOSTDINC_FLAGS = -nostdinc -isystem $(shell $(CC) -print-file-name=include) CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ +CHECKFLAGS += $(NOSTDINC_FLAGS) MODFLAGS = -DMODULE CFLAGS_MODULE = $(MODFLAGS) AFLAGS_MODULE = $(MODFLAGS) @@ -339,7 +341,6 @@ CFLAGS_KERNEL = AFLAGS_KERNEL = -NOSTDINC_FLAGS = -nostdinc -iwithprefix include # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option @@ -349,7 +350,8 @@ CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) CFLAGS := -Wall -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common + -fno-strict-aliasing -fno-common \ + -ffreestanding AFLAGS := -D__ASSEMBLY__ export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION LOCALVERSION KERNELRELEASE \ @@ -389,7 +391,7 @@ # using a seperate output directory. This allows convinient use # of make in output directory outputmakefile: - $(Q)if /usr/bin/env test ! $(srctree) -ef $(objtree); then \ + $(Q)if test ! $(srctree) -ef $(objtree); then \ $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \ > $(objtree)/Makefile; \ @@ -531,6 +533,9 @@ # warn about C99 declaration after statement CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) +# disable pointer signedness warnings in gcc 4.0 +CFLAGS += $(call cc-option,-Wno-pointer-sign,) + # Default kernel image to build when no specific target is given. # KBUILD_IMAGE may be overruled on the commandline or # set in the environment @@ -1167,7 +1172,7 @@ quiet_cmd_tags = MAKE $@ define cmd_tags rm -f $@; \ - CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \ + CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL"`; \ $(all-sources) | xargs ctags $$CTAGSF -a endef @@ -1211,6 +1216,9 @@ $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \ $(PERL) $(src)/scripts/checkstack.pl $(ARCH) +kernelrelease: + @echo $(KERNELRELEASE) + # FIXME Should go into a make.lib or something # =========================================================================== |
