summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2015-02-12 15:01:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-12 18:54:13 -0800
commitdd4a5c1e6531b9c6ba6ee1f3cb11f0aeea25881e (patch)
treeb58d8fa1997947a95f5470887582f7d08fd42470 /include/linux
parentdd10ca6c95600c0c357e724da4e5eb47066e3854 (diff)
downloadlinux-stable-dd4a5c1e6531b9c6ba6ee1f3cb11f0aeea25881e.tar.gz
linux-stable-dd4a5c1e6531b9c6ba6ee1f3cb11f0aeea25881e.tar.bz2
linux-stable-dd4a5c1e6531b9c6ba6ee1f3cb11f0aeea25881e.zip
linux/types.h: Always use unsigned long for pgoff_t
Everybody uses unsigned long for pgoff_t, and no one ever overrode the definition of pgoff_t. Keep it that way, and remove the option of overriding it. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/types.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/types.h b/include/linux/types.h
index 62323825cff9..6747247e3f9f 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -135,12 +135,9 @@ typedef unsigned long blkcnt_t;
#endif
/*
- * The type of an index into the pagecache. Use a #define so asm/types.h
- * can override it.
+ * The type of an index into the pagecache.
*/
-#ifndef pgoff_t
#define pgoff_t unsigned long
-#endif
/* A dma_addr_t can hold any valid DMA or bus address for the platform */
#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT