Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Dec 2002 08:11:36 -0800 (PST)
From:      Serguei Tzukanov <tzukanov@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 22292 for review
Message-ID:  <200212141611.gBEGBats051913@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22292

Change 22292 by tzukanov@tzukanov_antares on 2002/12/14 08:11:35

	Fix kernel build.

Affected files ...

.. //depot/projects/s390/sys/conf/Makefile.s390#2 edit
.. //depot/projects/s390/sys/conf/options.s390#3 edit
.. //depot/projects/s390/sys/s390/conf/GENERIC#3 edit
.. //depot/projects/s390/sys/s390/s390/elf_machdep.c#3 edit
.. //depot/projects/s390/sys/s390/s390/machdep.c#3 edit

Differences ...

==== //depot/projects/s390/sys/conf/Makefile.s390#2 (text+ko) ====

@@ -16,9 +16,10 @@
 # after which config should be rerun for all machines.
 #
 
+NO_MODULES=	yes
+
 .if defined(S390_TOOLCHAIN_HACK) 
 MACHINE_ARCH=	s390
-
 AS=	s390-freebsd5.0-as
 CC=	s390-freebsd5.0-gcc
 LD=	s390-freebsd5.0-ld

==== //depot/projects/s390/sys/conf/options.s390#3 (text+ko) ====

@@ -5,7 +5,4 @@
 ADDRESS_SPACE_2GB	opt_dat.h
 PMAP_SHPGPERPROC	opt_pmap.h
 
-SHOW_BUSYBUFS
-PANIC_REBOOT_WAIT_TIME	opt_panic.h
-
 DEV_HMCSC		opt_global.h

==== //depot/projects/s390/sys/s390/conf/GENERIC#3 (text+ko) ====

@@ -55,6 +55,7 @@
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	COMPAT_43		# Compatible with BSD 4.3
+options		COMPAT_FREEBSD4
 options 	MD_ROOT			# MD is potential root device
 options 	MD_ROOT_SIZE=2048
 

==== //depot/projects/s390/sys/s390/s390/elf_machdep.c#3 (text+ko) ====

@@ -212,7 +212,7 @@
 }
 
 int
-elf_cpu_unload_file(linker_file_t lf _unused)
+elf_cpu_unload_file(linker_file_t lf __unused)
 {
 	return 0;
 }

==== //depot/projects/s390/sys/s390/s390/machdep.c#3 (text+ko) ====

@@ -342,6 +342,14 @@
 	return EJUSTRETURN;
 }
 
+#ifdef COMPAT_FREEBSD4
+int
+freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
+{
+	return sigreturn(td, (struct sigreturn_args *)uap);
+}
+#endif
+
 int
 get_mcontext(struct thread *td, mcontext_t *mcp)
 {

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212141611.gBEGBats051913>