Return to Makefile CVS log

Up to [Development] / linux-2.6-xfs / include / asm-cris / arch-v32 / hwregs

Update 2.6.x-xfs to 2.6.23-rc4.

Also update fs/xfs with external mainline changes.
There were 12 such missing commits that I detected:

--------
commit ad690ef9e690f6c31f7d310b09ef1314bcec9033
Author: Al Viro <viro@ftp.linux.org.uk>
    xfs ioctl __user annotations

commit 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac
Author: Paul Mundt <lethal@linux-sh.org>
    mm: Remove slab destructors from kmem_cache_create().

commit d0217ac04ca6591841e5665f518e38064f4e65bd
Author: Nick Piggin <npiggin@suse.de>
    mm: fault feedback #1

commit 54cb8821de07f2ffcd28c380ce9b93d5784b40d7
Author: Nick Piggin <npiggin@suse.de>
    mm: merge populate and nopage into fault (fixes nonlinear)

commit d00806b183152af6d24f46f0c33f14162ca1262a
Author: Nick Piggin <npiggin@suse.de>
    mm: fix fault vs invalidate race for linear mappings

commit a569425512253992cc64ebf8b6d00a62f986db3e
Author: Christoph Hellwig <hch@infradead.org>
    knfsd: exportfs: add exportfs.h header

commit 831441862956fffa17b9801db37e6ea1650b0f69
Author: Rafael J. Wysocki <rjw@sisk.pl>
    Freezer: make kernel threads nonfreezable by default

commit 8e1f936b73150f5095448a0fee6d4f30a1f9001d
Author: Rusty Russell <rusty@rustcorp.com.au>
    mm: clean up and kernelify shrinker registration

commit 5ffc4ef45b3b0a57872f631b4e4ceb8ace0d7496
Author: Jens Axboe <jens.axboe@oracle.com>
    sendfile: remove .sendfile from filesystems that use generic_file_sendfile()

commit 8bb7844286fb8c9fce6f65d8288aeb09d03a5e0d
Author: Rafael J. Wysocki <rjw@sisk.pl>
    Add suspend-related notifications for CPU hotplug

commit 59c51591a0ac7568824f541f57de967e88adaa07
Author: Michael Opdenacker <michael@free-electrons.com>
    Fix occurrences of "the the "

commit 0ceb331433e8aad9c5f441a965d7c681f8b9046f
Author: Dmitriy Monakhov <dmonakhov@openvz.org>
    mm: move common segment checks to separate helper function
--------
Merge of 2.6.x-xfs-melb:linux:29656b by kenmcd.

# $Id: Makefile,v 1.13 2007/09/12 17:09:56 tes.longdrop.melbourne.sgi.com Exp $
# Makefile to generate or copy the latest register definitions
# and related datastructures and helpermacros.
# The offical place for these files is at:
RELEASE ?= r1_alfa5
OFFICIAL_INCDIR = /n/asic/projects/guinness/releases/$(RELEASE)/design/top/sw/include/

# which is updated on each new release.
INCL_ASMFILES   =
INCL_FILES      = ata_defs.h
INCL_FILES     += bif_core_defs.h
INCL_ASMFILES  += bif_core_defs_asm.h
INCL_FILES     += bif_slave_defs.h
#INCL_FILES     += bif_slave_ext_defs.h
INCL_FILES     += config_defs.h
INCL_ASMFILES  += config_defs_asm.h
INCL_FILES     += cpu_vect.h
#INCL_FILES     += cris_defs.h
#INCL_FILES     += cris_supp_reg.h # In handcrafted supp_reg.h
INCL_FILES     += dma.h
INCL_FILES     += dma_defs.h
INCL_FILES     += eth_defs.h
INCL_FILES     += extmem_defs.h
INCL_FILES     += gio_defs.h
INCL_ASMFILES  += gio_defs_asm.h
INCL_FILES     += intr_vect.h
INCL_FILES     += intr_vect_defs.h
INCL_ASMFILES  += intr_vect_defs_asm.h
INCL_FILES     += marb_bp_defs.h
INCL_FILES     += marb_defs.h
INCL_ASMFILES  += mmu_defs_asm.h
#INCL_FILES     += mmu_supp_reg.h # In handcrafted supp_reg.h
#INCL_FILES     += par_defs.h # No useful content
INCL_FILES     += pinmux_defs.h
INCL_FILES     += reg_map.h
INCL_ASMFILES  += reg_map_asm.h
INCL_FILES     += reg_rdwr.h
INCL_FILES     += ser_defs.h
#INCL_FILES     += spec_reg.h # In handcrafted supp_reg.h
INCL_FILES     += sser_defs.h
INCL_FILES     += strcop_defs.h
#INCL_FILES     += strcop.h # Where is this?
INCL_FILES     += strmux_defs.h
#INCL_FILES     += supp_reg.h # Handcrafted instead
INCL_FILES     += timer_defs.h

REGDESC =
REGDESC += $(BASEDIR)/io/ata/rtl/ata_regs.r
REGDESC += $(BASEDIR)/io/bif/rtl/bif_core_regs.r
REGDESC += $(BASEDIR)/io/bif/rtl/bif_slave_regs.r
#REGDESC += $(BASEDIR)/io/bif/sw/bif_slave_ext_regs.r
REGDESC += $(DESIGNDIR)/top/rtl/config_regs.r
REGDESC += $(BASEDIR)/mod/dma_common/rtl/dma_regdes.r
REGDESC += $(BASEDIR)/io/eth/rtl/eth_regs.r
REGDESC += $(BASEDIR)/io/bif/mod/extmem/extmem_regs.r
REGDESC += $(DESIGNDIR)/gio/rtl/gio_regs.r
REGDESC += $(BASEDIR)/core/cpu/intr_vect/rtl/guinness/ivmask.config.r
REGDESC += $(BASEDIR)/core/memarb/rtl/guinness/marb_top.r
REGDESC += $(BASEDIR)/core/cpu/mmu/doc/mmu_regs.r
#REGDESC += $(BASEDIR)/io/par_port/rtl/par_regs.r
REGDESC += $(BASEDIR)/io/pinmux/rtl/guinness/pinmux_regs.r
REGDESC += $(BASEDIR)/io/ser/rtl/ser_regs.r
REGDESC += $(BASEDIR)/core/strcop/rtl/strcop_regs.r
REGDESC += $(BASEDIR)/io/strmux/rtl/guinness/strmux_regs.r
REGDESC += $(BASEDIR)/io/timer/rtl/timer_regs.r
#REGDESC += $(BASEDIR)/io/usb/usb1_1/rtl/usb_regs.r


BASEDIR = /n/asic/design
DESIGNDIR = /n/asic/projects/guinness/design
RDES2C = /n/asic/bin/rdes2c
RDES2C = /n/asic/design/tools/rdesc/rdes2c
RDES2INTR = /n/asic/design/tools/rdesc/rdes2intr
RDES2TXT = /n/asic/design/tools/rdesc/rdes2txt

## all    - Just print help - you probably want to do 'make gen'
all: help

# Disable implicit rule that may generate deleted files from RCS/ directory.
%.r:

%.h:

## help   - This help
help:
	@grep '^## ' Makefile

## gen    - Generate include files
gen: $(INCL_FILES) $(INCL_ASMFILES)

ata_defs.h: $(BASEDIR)/io/ata/rtl/ata_regs.r
	$(RDES2C) $<
config_defs.h: $(DESIGNDIR)/top/rtl/config_regs.r
	$(RDES2C) $<
config_defs_asm.h: $(DESIGNDIR)/top/rtl/config_regs.r
	$(RDES2C) -asm $<
# Can't generate cpu_vect.h yet
#cpu_vect.h: $(DESIGNDIR)/top/rtl/cpu_vect.r # ????
#	$(RDES2INTR) $<
cpu_vect.h: $(OFFICIAL_INCDIR)cpu_vect.h
	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
dma_defs.h: $(BASEDIR)/core/dma/rtl/common/dma_regdes.r
	$(RDES2C) $<
$(BASEDIR)/core/dma/sw/dma.h:
dma.h: $(BASEDIR)/core/dma/sw/dma.h
	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
eth_defs.h: $(BASEDIR)/io/eth/rtl/eth_regs.r
	$(RDES2C) $<
extmem_defs.h: $(BASEDIR)/io/bif/mod/extmem/extmem_regs.r
	$(RDES2C) $<
gio_defs.h: $(DESIGNDIR)/gio/rtl/gio_regs.r
	$(RDES2C) $<
intr_vect_defs.h: $(BASEDIR)/core/cpu/intr_vect/rtl/guinness/ivmask.config.r
	$(RDES2C) $<
intr_vect_defs_asm.h: $(BASEDIR)/core/cpu/intr_vect/rtl/guinness/ivmask.config.r
	$(RDES2C) -asm $<
# Can't generate intr_vect.h yet
#intr_vect.h: $(BASEDIR)/core/cpu/intr_vect/rtl/guinness/ivmask.config.r
#	$(RDES2INTR) $<
intr_vect.h: $(OFFICIAL_INCDIR)intr_vect.h
	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
mmu_defs_asm.h: $(BASEDIR)/core/cpu/mmu/doc/mmu_regs.r
	$(RDES2C) -asm $<
par_defs.h: $(BASEDIR)/io/par_port/rtl/par_regs.r
	$(RDES2C) $<

# From /n/asic/projects/guinness/design/
reg_map.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
	$(RDES2C) -base 0xb0000000 $^
reg_map_asm.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
	$(RDES2C) -base 0xb0000000 -asm -outfile $@ $^

reg_rdwr.h: $(DESIGNDIR)/top/sw/include/reg_rdwr.h
	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@

ser_defs.h: $(BASEDIR)/io/ser/rtl/ser_regs.r
	$(RDES2C) $<
strcop_defs.h: $(BASEDIR)/core/strcop/rtl/strcop_regs.r
	$(RDES2C) $<
strcop.h: $(BASEDIR)/core/strcop/rtl/strcop.h
	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
strmux_defs.h: $(BASEDIR)/io/strmux/rtl/guinness/strmux_regs.r
	$(RDES2C) $<
timer_defs.h: $(BASEDIR)/io/timer/rtl/timer_regs.r
	$(RDES2C) $<
usb_defs.h: $(BASEDIR)/io/usb/usb1_1/rtl/usb_regs.r
	$(RDES2C) $<

## copy   - Copy files from official location
copy:
	@for HFILE in $(INCL_FILES); do \
		echo "  $$HFILE"; \
		cat $(OFFICIAL_INCDIR)$$HFILE | sed -e 's/\$$Id\:/id\:/g' > $$HFILE; \
	done
	@for HFILE in $(INCL_ASMFILES); do \
		echo "  $$HFILE"; \
		cat $(OFFICIAL_INCDIR)asm/$$HFILE | sed -e 's/\$$Id\:/id\:/g' > $$HFILE; \
	done
## ls_official - List official location
ls_official:
	(cd $(OFFICIAL_INCDIR); ls -l *.h )

## diff_official - Diff current directory with official location
diff_official:
	diff . $(OFFICIAL_INCDIR)

## doc    - Generate .axw files from register description.
doc: $(REGDESC)
	for RDES in $^; do \
		$(RDES2TXT) $$RDES; \
	done

.PHONY: axw
## %.axw  - Generate the specified .axw file (doesn't work for all files
##          due to inconsistent naming ir .r files.
%.axw: axw
	@for RDES in $(REGDESC); do \
		if echo "$$RDES" | grep $* ; then \
		  $(RDES2TXT) $$RDES; \
		fi \
	done

.PHONY: clean
## clean  - Remove .h files and .axw files.
clean:
	rm -rf $(INCL_FILES) *.axw