Menu
▾
▴
[linuxsh-dev] 2.5.23
|
From: NIIBE Y. <gn...@m1...> - 2002-06-26 01:43:56
|
Changes from mainline included.
2002-06-26 NIIBE Yutaka <gn...@m1...>
* AGAINST-2.5.23: New file.
* AGAINST-2.5.22: Removed.
* Makefile: Version 2.5.23.
* arch/sh/Makefile, arch/sh/boot/Makefile, arch/sh/kernel/time.c,
drivers/block/rd.c: Incorporate changes in 2.5.23.
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/Makefile,v
retrieving revision 1.28
diff -u -3 -p -r1.28 Makefile
--- Makefile 18 Jun 2002 04:05:00 -0000 1.28
+++ Makefile 26 Jun 2002 01:41:48 -0000
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 22
+SUBLEVEL = 23
EXTRAVERSION =-sh
# We are using a recursive build, so we need to do a little thinking
@@ -145,7 +145,8 @@ ifeq ($(filter $(noconfig_targets),$(MAK
.config:
@echo '***'
@echo '*** You have not yet configured your kernel!'
- @echo '*** Please run "make xconfig/menuconfig/config/oldconfig"'
+ @echo '*** Please run some configurator (do "make xconfig" or'
+ @echo '*** "make menuconfig" or "make oldconfig" or "make config").'
@echo '***'
@exit 1
@@ -330,18 +331,16 @@ scripts:
# The targets are still named depend / dep for traditional
# reasons, but the only thing we do here is generating
# the module version checksums.
-# FIXME: For now, we are also calling "archdep" from here,
-# which should be replaced by a more sensible solution.
.PHONY: depend dep $(patsubst %,_sfdep_%,$(SUBDIRS))
depend dep: .hdepend
# .hdepend is our (misnomed) marker for whether we've run
-# generated module versions and made archdep
+# generated module versions
.hdepend: $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE)
- @$(MAKE) archdep include/linux/modversions.h
+ @$(MAKE) include/linux/modversions.h
@touch $@
ifdef CONFIG_MODVERSIONS
@@ -420,8 +419,8 @@ $(patsubst %, _modinst_%, $(SUBDIRS)) :
else # CONFIG_MODULES
-# ---------------------------------------------------------------------------
# Modules not configured
+# ---------------------------------------------------------------------------
modules modules_install: FORCE
@echo
@@ -433,6 +432,25 @@ modules modules_install: FORCE
endif # CONFIG_MODULES
+# Generate asm-offsets.h
+# ---------------------------------------------------------------------------
+
+define generate-asm-offsets.h
+ (set -e; \
+ echo "#ifndef __ASM_OFFSETS_H__"; \
+ echo "#define __ASM_OFFSETS_H__"; \
+ echo "/*"; \
+ echo " * DO NOT MODIFY."; \
+ echo " *"; \
+ echo " * This file was generated by arch/$(ARCH)/Makefile"; \
+ echo " *"; \
+ echo " */"; \
+ echo ""; \
+ sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
+ echo ""; \
+ echo "#endif" )
+endef
+
# RPM target
# ---------------------------------------------------------------------------
@@ -461,6 +479,8 @@ rpm: clean spec
else # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+
# Targets which don't need .config
# ===========================================================================
#
@@ -519,23 +539,6 @@ allmodconfig:
defconfig:
yes '' | $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
-# How we generate .config depends on which *config the
-# user chose when calling make
-
-.config: $(filter oldconfig xconfig menuconfig config,$(MAKECMDGOALS)) ;
-
-# If the user gave commands from both the need / need not
-# .config sections, we need to call make again after
-# .config is generated, now to take care of the remaining
-# targets we know nothing about in this section
-
-remaining_targets := $(filter-out $(noconfig_targets),$(MAKECMDGOALS))
-
-$(remaining_targets) : make_with_config
-
-make_with_config: .config
- @$(MAKE) $(remaining_targets)
-
# Cleaning up
# ---------------------------------------------------------------------------
@@ -604,7 +607,8 @@ clean: archclean
mrproper: clean archmrproper
@echo 'Making mrproper'
- @find . \( -size 0 -o -name .depend \) -type f -print | xargs rm -f
+ @find . \( -size 0 -o -name .depend -o -name .\*.cmd \) \
+ -type f -print | xargs rm -f
@rm -f $(MRPROPER_FILES)
@rm -rf $(MRPROPER_DIRS)
@$(MAKE) -C Documentation/DocBook mrproper
@@ -639,8 +643,6 @@ sgmldocs psdocs pdfdocs htmldocs:
@$(MAKE) -C Documentation/DocBook $@
-endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-
# Scripts to check various things for consistency
# ---------------------------------------------------------------------------
@@ -652,6 +654,18 @@ checkhelp:
checkincludes:
find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
+
+else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+
+# We're called with both targets which do and do not need
+# .config included. Handle them one after the other.
+# ===========================================================================
+
+%:: FORCE
+ $(MAKE) $@
+
+endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
# FIXME Should go into a make.lib or something
# ===========================================================================
Index: TODO
===================================================================
RCS file: /cvsroot/linuxsh/linux/TODO,v
retrieving revision 1.2
diff -u -3 -p -r1.2 TODO
--- TODO 10 Apr 2002 11:09:38 -0000 1.2
+++ TODO 26 Jun 2002 01:41:48 -0000
@@ -1,3 +1,13 @@
+2.5.23:
+change_page_attr
+ arch/i386/mm/ioremap.c
+ arch/i386/mm/pageattr.c
+ include/asm-i386/cacheflush.h
+ include/asm-i386/io.h
+ include/asm-i386/page.h
+ include/asm-i386/pgtable-2level.h
+ include/asm-i386/pgtable.h
+
* arch/sh/kernel/setup.c (setup_arch):
request_resource
Index: arch/sh/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/Makefile,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Makefile
--- arch/sh/Makefile 16 Oct 2001 21:33:00 -0000 1.2
+++ arch/sh/Makefile 26 Jun 2002 01:41:48 -0000
@@ -94,6 +94,3 @@ archclean:
archmrproper:
rm -f arch/sh/vmlinux.lds
-
-archdep:
- @$(MAKEBOOT) dep
Index: arch/sh/boot/Makefile
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/boot/Makefile,v
retrieving revision 1.2
diff -u -3 -p -r1.2 Makefile
--- arch/sh/boot/Makefile 18 Jun 2002 04:05:00 -0000 1.2
+++ arch/sh/boot/Makefile 26 Jun 2002 01:41:48 -0000
@@ -25,8 +25,6 @@ install: Image
zinstall: zImage
sh -x ./install.sh $(KERNELRELEASE) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
-dep:
-
clean:
rm -f tools/build
rm -f setup bootsect zImage compressed/vmlinux.out
Index: arch/sh/kernel/time.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/time.c,v
retrieving revision 1.3
diff -u -3 -p -r1.3 time.c
--- arch/sh/kernel/time.c 25 Apr 2002 07:21:04 -0000 1.3
+++ arch/sh/kernel/time.c 26 Jun 2002 01:41:48 -0000
@@ -70,6 +70,8 @@
#endif /* CONFIG_CPU_SUBTYPE_ST40STB1 */
#endif /* __sh3__ or __SH4__ */
+u64 jiffies_64;
+
extern rwlock_t xtime_lock;
extern unsigned long wall_jiffies;
#define TICK_SIZE tick
Index: drivers/block/rd.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/drivers/block/rd.c,v
retrieving revision 1.15
diff -u -3 -p -r1.15 rd.c
--- drivers/block/rd.c 18 Jun 2002 04:05:00 -0000 1.15
+++ drivers/block/rd.c 26 Jun 2002 01:41:48 -0000
@@ -45,6 +45,8 @@
#include <linux/config.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <asm/atomic.h>
+#include <linux/bio.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/devfs_fs_kernel.h>
|
