On Sun 23-03-14 15:08:35, Matthew Wilcox wrote: > It is now empty as all of its contents have been replaced by fs/xip.c Looks good. You can add: Reviewed-by: Jan Kara <jack@xxxxxxx> Honza > > Signed-off-by: Matthew Wilcox <matthew.r.wilcox@xxxxxxxxx> > --- > mm/Makefile | 1 - > mm/filemap_xip.c | 23 ----------------------- > 2 files changed, 24 deletions(-) > delete mode 100644 mm/filemap_xip.c > > diff --git a/mm/Makefile b/mm/Makefile > index 310c90a..454c176 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -47,7 +47,6 @@ obj-$(CONFIG_SLUB) += slub.o > obj-$(CONFIG_KMEMCHECK) += kmemcheck.o > obj-$(CONFIG_FAILSLAB) += failslab.o > obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o > -obj-$(CONFIG_FS_XIP) += filemap_xip.o > obj-$(CONFIG_MIGRATION) += migrate.o > obj-$(CONFIG_QUICKLIST) += quicklist.o > obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o > diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c > deleted file mode 100644 > index 6316578..0000000 > --- a/mm/filemap_xip.c > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* > - * linux/mm/filemap_xip.c > - * > - * Copyright (C) 2005 IBM Corporation > - * Author: Carsten Otte <cotte@xxxxxxxxxx> > - * > - * derived from linux/mm/filemap.c - Copyright (C) Linus Torvalds > - * > - */ > - > -#include <linux/fs.h> > -#include <linux/pagemap.h> > -#include <linux/export.h> > -#include <linux/uio.h> > -#include <linux/rmap.h> > -#include <linux/mmu_notifier.h> > -#include <linux/sched.h> > -#include <linux/seqlock.h> > -#include <linux/mutex.h> > -#include <linux/gfp.h> > -#include <asm/tlbflush.h> > -#include <asm/io.h> > - > -- > 1.9.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Jan Kara <jack@xxxxxxx> SUSE Labs, CR -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>