linux-vax-k25-commit Mailing List for Linux/VAX Porting Project (Page 114)

Status: Pre-Alpha

Brought to you by: airlied, atp, kenn

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

Flat | Threaded

<< < 1 .. 112 113 114 115 116 .. 138 > >> (Page 114 of 138)

[LV-k25-commit] CVS: kernel-2.5/drivers/char tty_io.c,1.4,1.5

From: Kenn H. <ke...@us...> - 2003-02-14 01:52:26

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv15651/drivers/char

Modified Files:
	tty_io.c 
Log Message:
Merge with 2.5.34

Index: tty_io.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/tty_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tty_io.c	9 Feb 2003 21:34:06 -0000	1.4
+++ tty_io.c	14 Feb 2003 01:52:22 -0000	1.5
@@ -1458,15 +1458,9 @@
 	if (on) {
 		if (!waitqueue_active(&tty->read_wait))
 			tty->minimum_to_wake = 1;
-		if (filp->f_owner.pid == 0) {
-			retval = security_ops->file_set_fowner(filp);
-			if (retval)
-				return retval;
-
-			filp->f_owner.pid = (-tty->pgrp) ? : current->pid;
-			filp->f_owner.uid = current->uid;
-			filp->f_owner.euid = current->euid;
-		}
+		retval = f_setown(filp, (-tty->pgrp) ? : current->pid, 0);
+		if (retval)
+			return retval;
 	} else {
 		if (!tty->fasync && !waitqueue_active(&tty->read_wait))
 			tty->minimum_to_wake = N_TTY_BUF_SIZE;

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.21,1.22

From: Kenn H. <ke...@us...> - 2003-02-14 01:52:07

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv15607/drivers/char

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.34

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	12 Feb 2003 23:43:36 -0000	1.21
+++ Makefile	14 Feb 2003 01:52:04 -0000	1.22
@@ -12,10 +12,9 @@
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
-export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
-			misc.o pty.o random.o selection.o \
-			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
-			ip2main.o nvram.o
+export-objs     :=	busmouse.o console.o generic_serial.o ip2main.o \
+			ite_gpio.o misc.o nvram.o pty.o random.o rtc.o \
+			selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
 
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE) += console.o defkeymap.o

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.39,1.40

From: Kenn H. <ke...@us...> - 2003-02-14 01:51:46

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv15356

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.34


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile	12 Feb 2003 23:43:35 -0000	1.39
+++ Makefile	14 Feb 2003 01:51:40 -0000	1.40
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 33
+SUBLEVEL = 34
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -318,7 +318,7 @@
 #	This can be used by arch/$ARCH/Makefile to preprocess
 #	their vmlinux.lds.S file
 
-arch/$ARCH/vmlinux.lds.s: arch/$ARCH/vmlinux.lds.S
+arch/$(ARCH)/vmlinux.lds.s: arch/$(ARCH)/vmlinux.lds.S
 	$(CPP) $(CPPFLAGS) $(CPPFLAGS_$@) -P -C -U$(ARCH) $< -o $@
 
 # Single targets

[LV-k25-commit] CVS: kernel-2.5/fs/jfs jfs_extendfs.h,1.1.1.2,NONE

From: Kenn H. <ke...@us...> - 2003-02-14 01:48:23

Update of /cvsroot/linux-vax/kernel-2.5/fs/jfs
In directory sc8-pr-cvs1:/tmp/cvs-serv14474/fs/jfs

Removed Files:
	jfs_extendfs.h 
Log Message:
Merge with 2.5.34


--- jfs_extendfs.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/ppc/4xx_io stb_kb.c,1.1.1.4,NONE

From: Kenn H. <ke...@us...> - 2003-02-14 01:48:22

Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc/4xx_io
In directory sc8-pr-cvs1:/tmp/cvs-serv14474/arch/ppc/4xx_io

Removed Files:
	stb_kb.c 
Log Message:
Merge with 2.5.34


--- stb_kb.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/ppc/kernel galaxy_pci.c,1.1.1.2,NONE

From: Kenn H. <ke...@us...> - 2003-02-14 01:48:22

Update of /cvsroot/linux-vax/kernel-2.5/arch/ppc/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv14474/arch/ppc/kernel

Removed Files:
	galaxy_pci.c 
Log Message:
Merge with 2.5.34


--- galaxy_pci.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/arch/i386 vmlinux.lds,1.1.1.6,NONE

From: Kenn H. <ke...@us...> - 2003-02-14 01:48:22

Update of /cvsroot/linux-vax/kernel-2.5/arch/i386
In directory sc8-pr-cvs1:/tmp/cvs-serv14474/arch/i386

Removed Files:
	vmlinux.lds 
Log Message:
Merge with 2.5.34


--- vmlinux.lds DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax system.h,1.7,1.8

From: Kenn H. <ke...@us...> - 2003-02-14 00:55:40

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv31190

Modified Files:
	system.h 
Log Message:
local_irq_save() and local_irq_save_off() were wrongly named in 2.5.32.
Now called local_save_flags() and local_irq_save() respectively.


Index: system.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/system.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- system.h	9 Feb 2003 01:49:23 -0000	1.7
+++ system.h	14 Feb 2003 00:55:37 -0000	1.8
@@ -74,8 +74,8 @@
         __r0;                                                   \
 })
 
-#define local_irq_save(flags)           ((flags) = getipl())
-#define local_irq_save_off(flags)	((flags) = swpipl(31))
+#define local_save_flags(flags)		((flags) = getipl())
+#define local_irq_save(flags)		((flags) = swpipl(31))
 #define local_irq_restore(flags)	setipl(flags)
 #define local_irq_disable()		setipl(31)

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax tlb.h,1.5,1.6

From: Kenn H. <ke...@us...> - 2003-02-14 00:54:44

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv31095

Modified Files:
	tlb.h 
Log Message:
Merge with 2.5.33


Index: tlb.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/tlb.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tlb.h	7 Jan 2003 00:27:54 -0000	1.5
+++ tlb.h	14 Feb 2003 00:54:40 -0000	1.6
@@ -6,9 +6,9 @@
  * VAX doesn't need any special per-pte or
  * per-vma handling..
  */
-#define tlb_start_vma(tlb, vma)			do { } while (0)
-#define tlb_end_vma(tlb, vma)			do { } while (0)
-#define tlb_remove_tlb_entry(tlb, pte, address)	do { } while (0)
+#define tlb_start_vma(tlb, vma)				do { } while (0)
+#define tlb_end_vma(tlb, vma)				do { } while (0)
+#define __tlb_remove_tlb_entry(tlb, pte, address)	do { } while (0)
 
 /*
  * .. because we flush the whole mm when it

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax/mm pgalloc.h,1.7,1.8

From: Kenn H. <ke...@us...> - 2003-02-14 00:54:17

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm
In directory sc8-pr-cvs1:/tmp/cvs-serv30782/mm

Modified Files:
	pgalloc.h 
Log Message:
pte_free_tlb() and pmd_free_tlb() get double-underscore prefixes
in 2.5.33 (the non-underscored versions become wrappers in
asm-generic/tlb.h


Index: pgalloc.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-vax/mm/pgalloc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pgalloc.h	23 Jan 2003 23:21:37 -0000	1.7
+++ pgalloc.h	14 Feb 2003 00:54:14 -0000	1.8
@@ -28,10 +28,7 @@
  *  is mapped where, requires a pmd with 0x800 entries. 
  */
 
-#include <linux/gfp.h>
-
-/* Forward declaration to avoid having to pull in all of linux/mm.h */
-struct mm_struct;
+#include <linux/mm.h>
 
 #ifndef CONFIG_SMP
 extern struct pgd_cache {
@@ -104,8 +101,8 @@
 
 /* We don't need the generic TLB shootdown stuff yet.  Might need it for
    SMP later */
-#define pmd_free_tlb(tlb, pmd)		pmd_free(pmd)
-#define pte_free_tlb(tlb, pte_page)	pte_free(pte_page)
+#define __pmd_free_tlb(tlb, pmd)	pmd_free(pmd)
+#define __pte_free_tlb(tlb, pte_page)	pte_free(pte_page)
 
 /* in arch/vax/mm/pgalloc.c */
 pgd_t *pgd_alloc(struct mm_struct *mm);

[LV-k25-commit] CVS: kernel-2.5/arch/vax/kernel process.c,1.12,1.13

From: Kenn H. <ke...@us...> - 2003-02-14 00:53:04

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1:/tmp/cvs-serv30601/arch/vax/kernel

Modified Files:
	process.c 
Log Message:
do_fork() gets another argument in 2.5.33


Index: process.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/process.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- process.c	9 Feb 2003 01:44:54 -0000	1.12
+++ process.c	14 Feb 2003 00:53:00 -0000	1.13
@@ -200,7 +200,7 @@
 	printk("sys_clone: calling do_fork(0x%08lx, 0x%08lx, 0x%p)\n",
 				clone_flags, newsp, regs); 
 #endif
-	p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0);
+	p = do_fork(clone_flags & ~CLONE_IDLETASK, newsp, regs, 0, NULL);
 	retval = IS_ERR(p) ? PTR_ERR(p) : p->pid;
 
 #ifdef VAX_PROCESS_DEBUG
@@ -212,14 +212,14 @@
 int sys_fork(struct pt_regs *regs)
 {
 	struct task_struct *p;
-	p = do_fork(SIGCHLD, regs->sp, regs, 0);
+	p = do_fork(SIGCHLD, regs->sp, regs, 0, NULL);
 	return IS_ERR(p) ? PTR_ERR(p) : p->pid;
 }
 
 int sys_vfork(struct pt_regs *regs)
 {
 	struct task_struct *p;
-	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0);
+	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL);
 	return IS_ERR(p) ? PTR_ERR(p) : p->pid;
 }

[LV-k25-commit] CVS: kernel-2.5/scripts .cvsignore,1.5,1.6

From: Kenn H. <ke...@us...> - 2003-02-12 23:49:41

Update of /cvsroot/linux-vax/kernel-2.5/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv23658/scripts

Modified Files:
	.cvsignore 
Log Message:
New target: conmakehash


Index: .cvsignore
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/scripts/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	10 Feb 2003 00:56:54 -0000	1.5
+++ .cvsignore	12 Feb 2003 23:49:37 -0000	1.6
@@ -5,3 +5,4 @@
 split-include
 fixdep
 docproc
+conmakehash

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.20,1.21

From: Kenn H. <ke...@us...> - 2003-02-12 23:43:41

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv20856/drivers/char

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.33


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile	10 Feb 2003 23:47:10 -0000	1.20
+++ Makefile	12 Feb 2003 23:43:36 -0000	1.21
@@ -15,7 +15,7 @@
 export-objs     :=	busmouse.o console.o keyboard.o sysrq.o \
 			misc.o pty.o random.o selection.o \
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
-			ip2main.o
+			ip2main.o nvram.o
 
 obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
 obj-$(CONFIG_HW_CONSOLE) += console.o defkeymap.o

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.38,1.39

From: Kenn H. <ke...@us...> - 2003-02-12 23:43:40

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv20856

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.33


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile	10 Feb 2003 23:47:02 -0000	1.38
+++ Makefile	12 Feb 2003 23:43:35 -0000	1.39
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 32
+SUBLEVEL = 33
 EXTRAVERSION =
 
 # *DOCUMENTATION*

[LV-k25-commit] CVS: kernel-2.5/include/asm-ia64 efi.h,1.1.1.5,NONE

From: Kenn H. <ke...@us...> - 2003-02-12 23:43:01

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-ia64
In directory sc8-pr-cvs1:/tmp/cvs-serv20490/include/asm-ia64

Removed Files:
	efi.h 
Log Message:
Merge with 2.5.33


--- efi.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/acpi/debugger dbdisasm.c,1.1.1.4,NONE

From: Kenn H. <ke...@us...> - 2003-02-12 23:42:57

Update of /cvsroot/linux-vax/kernel-2.5/drivers/acpi/debugger
In directory sc8-pr-cvs1:/tmp/cvs-serv20490/drivers/acpi/debugger

Removed Files:
	dbdisasm.c 
Log Message:
Merge with 2.5.33


--- dbdisasm.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax kmap_types.h,NONE,1.1 percpu.h,NONE,1.1

From: Kenn H. <ke...@us...> - 2003-02-11 23:51:07

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv11416

Added Files:
	kmap_types.h percpu.h 
Log Message:
2.5.32 needs these headers.  percpu.h just delegates to 
asm-generic/percpu.h and kmap_types.h is copied from sparc64


--- NEW FILE ---
#ifndef _VAX_KMAP_TYPES_H
#define _VAX_KMAP_TYPES_H

enum km_type {
	KM_BOUNCE_READ,
	KM_SKB_SUNRPC_DATA,
	KM_SKB_DATA_SOFTIRQ,
	KM_USER0,
	KM_USER1,
	KM_BIO_SRC_IRQ,
	KM_BIO_DST_IRQ,
	KM_PTE0,
	KM_PTE1,
	KM_IRQ0,
	KM_IRQ1,
	KM_TYPE_NR
};

#endif

--- NEW FILE ---
#ifndef _VAX_PERCPU_H
#define _VAX_PERCPU_H

#include <asm-generic/percpu.h>

#endif /* _VAX_PERCPU_H */

[LV-k25-commit] CVS: kernel-2.5/include/asm-vax keyboard.h,1.3,NONE smplock.h,1.3,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:50:58

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-vax
In directory sc8-pr-cvs1:/tmp/cvs-serv1646/include/asm-vax

Removed Files:
	keyboard.h smplock.h 
Log Message:
2.5.32 no longer requires asm/keyboard.h and asm/smplock.h


--- keyboard.h DELETED ---

--- smplock.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/ide ide-dma.c,1.2,1.3 ide-geometry.c,1.2,1.3 ide-probe.c,1.2,1.3 ide-proc.c,1.2,1.3 pdcadma.c,1.2,1.3 ata-timing.c,1.1.1.5,NONE atapi.c,1.1.1.3,NONE ataraid.c,1.1.1.8,NONE ataraid.h,1.1.1.1,NONE device.c,1.1.1.6,NONE hptraid.c,1.1.1.8,NONE hptraid.h,1.1.1.1,NONE ioctl.c,1.1.1.11,NONE ioctl.h,1.1.1.1,NONE main.c,1.1.1.9,NONE pcidma.c,1.1.1.10,NONE pcihost.h,1.1.1.5,NONE pdcraid.c,1.1.1.8,NONE pdcraid.h,1.1.1.1,NONE probe.c,1.1.1.11,NONE quirks.c,1.1.1.2,NONE tcq.c,1.1.1.12,NONE timing.h,1.1.1.1,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:48

Update of /cvsroot/linux-vax/kernel-2.5/drivers/ide
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/drivers/ide

Added Files:
	ide-dma.c ide-geometry.c ide-probe.c ide-proc.c pdcadma.c 
Removed Files:
	ata-timing.c atapi.c ataraid.c ataraid.h device.c hptraid.c 
	hptraid.h ioctl.c ioctl.h main.c pcidma.c pcihost.h pdcraid.c 
	pdcraid.h probe.c quirks.c tcq.c timing.h 
Log Message:
Merge with 2.5.32







--- ata-timing.c DELETED ---

--- atapi.c DELETED ---

--- ataraid.c DELETED ---

--- ataraid.h DELETED ---

--- device.c DELETED ---

--- hptraid.c DELETED ---

--- hptraid.h DELETED ---

--- ioctl.c DELETED ---

--- ioctl.h DELETED ---

--- main.c DELETED ---

--- pcidma.c DELETED ---

--- pcihost.h DELETED ---

--- pdcraid.c DELETED ---

--- pdcraid.h DELETED ---

--- probe.c DELETED ---

--- quirks.c DELETED ---

--- tcq.c DELETED ---

--- timing.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/drivers/char Makefile,1.19,1.20 conmakehash.c,1.1.1.1,NONE pc_keyb.c,1.1.1.4,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:46

Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/drivers/char

Modified Files:
	Makefile 
Removed Files:
	conmakehash.c pc_keyb.c 
Log Message:
Merge with 2.5.32


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile	10 Feb 2003 02:23:43 -0000	1.19
+++ Makefile	10 Feb 2003 23:47:10 -0000	1.20
@@ -17,116 +17,8 @@
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
 			ip2main.o
 
-KEYMAP   =defkeymap.o
-KEYBD    =pc_keyb.o
-CONSOLE  =console.o
-
-ifeq ($(ARCH),s390)
-  KEYMAP   =
-  KEYBD    =
-  CONSOLE  =
-endif
-
-ifeq ($(ARCH),mips)
-  ifneq ($(CONFIG_PC_KEYB),y)
-    KEYBD    =
-  endif
-endif
-
-ifeq ($(ARCH),s390x)
-  KEYMAP   =
-  KEYBD    =
-  CONSOLE  =
-endif
-
-ifeq ($(ARCH),m68k)
-   ifdef CONFIG_AMIGA
-      KEYBD = amikeyb.o
-   else
-      KEYBD =
-   endif
-endif
-
-ifdef CONFIG_Q40
-  KEYBD += q40_keyb.o
-  SERIAL = serial.o
-endif
-
-ifdef CONFIG_APOLLO
-  KEYBD += dn_keyb.o
-endif
-
-ifeq ($(ARCH),arm)
-  ifneq ($(CONFIG_PC_KEYMAP),y)
-    KEYMAP   =
-  endif
-  ifneq ($(CONFIG_PC_KEYB),y)
-    KEYBD    =
-  endif
-endif
-
-ifeq ($(ARCH),um)
-  KEYMAP   =
-  KEYBD    =
-  CONSOLE  =
-endif
-
-ifeq ($(ARCH),sh)
-  KEYMAP   =
-  KEYBD    =
-  CONSOLE  =
-  ifeq ($(CONFIG_SH_HP600),y)
-  KEYMAP   = defkeymap.o
-  KEYBD    = scan_keyb.o hp600_keyb.o
-  CONSOLE  = console.o
-  endif
-  ifeq ($(CONFIG_SH_DMIDA),y)
-  # DMIDA does not connect the HD64465 PS/2 keyboard port
-  # but we allow for USB keyboards to be plugged in.
-  KEYMAP   = defkeymap.o
-  KEYBD    = # hd64465_keyb.o pc_keyb.o
-  CONSOLE  = console.o
-  endif
-  ifeq ($(CONFIG_SH_EC3104),y)
-  KEYMAP   = defkeymap.o
-  KEYBD    = ec3104_keyb.o
-  CONSOLE  = console.o
-  endif
-  ifeq ($(CONFIG_SH_DREAMCAST),y)
-  KEYMAP   = defkeymap.o
-  KEYBD    =
-  CONSOLE  = console.o
-  endif
-endif
-
-ifeq ($(CONFIG_DECSTATION),y)
-  KEYMAP   =
-  KEYBD    =
-  SERIAL   = decserial.o
-endif
-
-ifeq ($(CONFIG_BAGET_MIPS),y)
-  KEYBD    =
-endif
-
-ifeq ($(CONFIG_QTRONIX_KEYBOARD),y)
-  KEYBD    = qtronix.o
-  KEYMAP   = qtronixmap.o
-endif
-
-ifeq ($(CONFIG_SPARC32),y)
-  KEYBD    =
-endif
-
-ifeq ($(CONFIG_SPARC64),y)
-  KEYBD    =
-endif
-
-obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o $(CONSOLE) selection.o
-#obj-$(CONFIG_SERIAL) += $(SERIAL) # Fix for decserial.o
-
-obj-$(CONFIG_VT) += keyboard.o $(KEYMAP) $(KEYBD)
-
+obj-$(CONFIG_VT) += vt.o vc_screen.o consolemap.o consolemap_deftbl.o selection.o keyboard.o
+obj-$(CONFIG_HW_CONSOLE) += console.o defkeymap.o
 obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o
 obj-$(CONFIG_ATARI_DSP56K) += dsp56k.o
 obj-$(CONFIG_ROCKETPORT) += rocket.o
@@ -169,6 +61,7 @@
 obj-$(CONFIG_SONYPI) += sonypi.o
 obj-$(CONFIG_ATARIMOUSE) += atarimouse.o
 obj-$(CONFIG_RTC) += rtc.o
+obj-$(CONFIG_GEN_RTC) += genrtc.o
 obj-$(CONFIG_EFI_RTC) += efirtc.o
 ifeq ($(CONFIG_PPC),)
   obj-$(CONFIG_NVRAM) += nvram.o
@@ -210,12 +103,10 @@
 obj-$(CONFIG_DRM) += drm/
 obj-$(CONFIG_PCMCIA) += pcmcia/
 
-host-progs := conmakehash
-
 include $(TOPDIR)/Rules.make
 
-$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
-	$(obj)/conmakehash $< > $@
+$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
+	$(call do_cmd,CONMK  $(echo_target),$(objtree)/scripts/conmakehash $< > $@)
 
 $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 

--- conmakehash.c DELETED ---

--- pc_keyb.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5 Makefile,1.37,1.38

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:40

Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv31562

Modified Files:
	Makefile 
Log Message:
Merge with 2.5.32


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile	10 Feb 2003 02:05:06 -0000	1.37
+++ Makefile	10 Feb 2003 23:47:02 -0000	1.38
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 31
+SUBLEVEL = 32
 EXTRAVERSION =
 
 # *DOCUMENTATION*
@@ -43,9 +43,6 @@
 	  else echo sh; fi ; fi)
 TOPDIR	:= $(CURDIR)
 
-HPATH   	= $(TOPDIR)/include
-FINDHPATH	= $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net
-
 HOSTCC  	= gcc
 HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
 
@@ -151,7 +148,7 @@
 NOSTDINC_FLAGS  = -nostdinc -iwithprefix include
 
 export	VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION KERNELRELEASE ARCH \
-	CONFIG_SHELL TOPDIR HPATH HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
+	CONFIG_SHELL TOPDIR HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \
 	CPP AR NM STRIP OBJCOPY OBJDUMP MAKE MAKEFILES GENKSYMS PERL
 
 export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS OBJCOPYFLAGS
@@ -199,11 +196,17 @@
 
 #	If .config doesn't exist - tough luck
 
-.config:
+.config: arch/$(ARCH)/config.in $(shell find . -name Config.in)
+	@echo '***'
+	@if [ -f $@ ]; then \
+	  echo '*** The tree was updated, so your .config may be'; \
+	  echo '*** out of date!'; \
+	else \
+	  echo '*** You have not yet configured your kernel!'; \
+	fi
 	@echo '***'
-	@echo '*** You have not yet configured your kernel!'
-	@echo '*** Please run some configurator (do "make xconfig" or'
-	@echo '*** "make menuconfig" or "make oldconfig" or "make config").'
+	@echo '*** Please run some configurator (e.g. "make oldconfig" or'
+	@echo '*** "make menuconfig" or "make xconfig").'
 	@echo '***'
 	@exit 1
 
@@ -227,7 +230,7 @@
 # standard CFLAGS
 #
 
-CPPFLAGS := -D__KERNEL__ -I$(HPATH)
+CPPFLAGS := -D__KERNEL__ -I$(objtree)/include
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  -fomit-frame-pointer -fno-strict-aliasing -fno-common
@@ -312,6 +315,12 @@
 prepare: include/linux/version.h include/asm include/config/MARKER
 	@echo '  Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
 
+#	This can be used by arch/$ARCH/Makefile to preprocess
+#	their vmlinux.lds.S file
+
+arch/$ARCH/vmlinux.lds.s: arch/$ARCH/vmlinux.lds.S
+	$(CPP) $(CPPFLAGS) $(CPPFLAGS_$@) -P -C -U$(ARCH) $< -o $@
+
 # Single targets
 # ---------------------------------------------------------------------------
 
@@ -428,7 +437,7 @@
 #	Build modules
 
 ifdef CONFIG_MODVERSIONS
-MODFLAGS += -include $(HPATH)/linux/modversions.h
+MODFLAGS += -include $(objtree)/include/linux/modversions.h
 endif
 
 .PHONY: modules
@@ -565,28 +574,28 @@
 
 menuconfig:
 	@$(MAKE) -C scripts lxdialog
-	$(CONFIG_SHELL) scripts/Menuconfig arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Menuconfig arch/$(ARCH)/config.in
 
 config:
-	$(CONFIG_SHELL) scripts/Configure arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure arch/$(ARCH)/config.in
 
 oldconfig:
-	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
 
 randconfig:
-	$(CONFIG_SHELL) scripts/Configure -r arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure -r arch/$(ARCH)/config.in
 
 allyesconfig:
-	$(CONFIG_SHELL) scripts/Configure -y arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure -y arch/$(ARCH)/config.in
 
 allnoconfig:
-	$(CONFIG_SHELL) scripts/Configure -n arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure -n arch/$(ARCH)/config.in
 
 allmodconfig:
-	$(CONFIG_SHELL) scripts/Configure -m arch/$(ARCH)/config.in
+	$(CONFIG_SHELL) $(src)/scripts/Configure -m arch/$(ARCH)/config.in
 
 defconfig:
-	yes '' | $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
+	yes '' | $(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
 
 # Cleaning up
 # ---------------------------------------------------------------------------
@@ -631,12 +640,9 @@
 	sound/oss/pndspini.c \
 	drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
 	.version .config* config.in config.old \
-	scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
-	scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
 	.menuconfig.log \
 	include/asm \
-	.hdepend scripts/split-include scripts/docproc \
-	scripts/fixdep $(TOPDIR)/include/linux/modversions.h \
+	.hdepend $(TOPDIR)/include/linux/modversions.h \
 	tags TAGS kernel.spec \
 	.tmpversion
 
@@ -666,6 +672,7 @@
 		-type f -print | xargs rm -f
 	@rm -f $(MRPROPER_FILES)
 	@rm -rf $(MRPROPER_DIRS)
+	@$(MAKE) -C scripts mrproper
 	@$(MAKE) -f Documentation/DocBook/Makefile mrproper
 
 distclean: mrproper

[LV-k25-commit] CVS: kernel-2.5/net/core ext8022.c,1.1.1.2,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:26

Update of /cvsroot/linux-vax/kernel-2.5/net/core
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/net/core

Removed Files:
	ext8022.c 
Log Message:
Merge with 2.5.32


--- ext8022.c DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/linux kbd_ll.h,1.1.1.1,NONE romfs_fs_sb.h,1.1.1.1,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:26

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/include/linux

Removed Files:
	kbd_ll.h romfs_fs_sb.h 
Log Message:
Merge with 2.5.32


--- kbd_ll.h DELETED ---

--- romfs_fs_sb.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-x86_64 keyboard.h,1.1.1.1,NONE smplock.h,1.1.1.1,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:26

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-x86_64
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/include/asm-x86_64

Removed Files:
	keyboard.h smplock.h 
Log Message:
Merge with 2.5.32


--- keyboard.h DELETED ---

--- smplock.h DELETED ---

[LV-k25-commit] CVS: kernel-2.5/include/asm-s390x smplock.h,1.1.1.2,NONE

From: Kenn H. <ke...@us...> - 2003-02-10 23:47:24

Update of /cvsroot/linux-vax/kernel-2.5/include/asm-s390x
In directory sc8-pr-cvs1:/tmp/cvs-serv31562/include/asm-s390x

Removed Files:
	smplock.h 
Log Message:
Merge with 2.5.32


--- smplock.h DELETED ---

Flat | Threaded

<< < 1 .. 112 113 114 115 116 .. 138 > >> (Page 114 of 138)