summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-05 20:26:59 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-23 19:24:41 +0200
commit0bd9f7323e918eb4c497a2905df2bda8ae909bfb (patch)
tree6e518581c719348912d5fbc70147dd8fecaaa7d9
parent238df763a292566596218aebc9fe6e61202386c8 (diff)
backports: remove shmem_read_mapping_page_gfp()
This was only needed for some of the DRM drivers, remove it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--backport/backport-include/linux/shmem_fs.h39
-rw-r--r--backport/compat/compat-3.0.c26
2 files changed, 0 insertions, 65 deletions
diff --git a/backport/backport-include/linux/shmem_fs.h b/backport/backport-include/linux/shmem_fs.h
deleted file mode 100644
index 4d3964e2..00000000
--- a/backport/backport-include/linux/shmem_fs.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef __BACKPORT_LINUX_SHMEM_FS_H
-#define __BACKPORT_LINUX_SHMEM_FS_H
-#include_next <linux/shmem_fs.h>
-
-
-#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4))
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
-/* This pulls-in a lot of non-exported symbol backports
- * on kernels older than 2.6.32. There's no harm for not
- * making this available on kernels < 2.6.32. */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-#include <linux/pagemap.h>
-/* This backports the 2nd part of:
- *
- * commit d9d90e5eb70e09903dadff42099b6c948f814050
- * Author: Hugh Dickins <hughd@google.com>
- * Date: Mon Jun 27 16:18:04 2011 -0700
- *
- * tmpfs: add shmem_read_mapping_page_gfp
- *
- * First part is in compat-3.0.c.
- */
-#define shmem_read_mapping_page_gfp LINUX_BACKPORT(shmem_read_mapping_page_gfp)
-extern struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
- pgoff_t index, gfp_t gfp);
-
-
-#define shmem_read_mapping_page LINUX_BACKPORT(shmem_read_mapping_page)
-static inline struct page *shmem_read_mapping_page(
- struct address_space *mapping, pgoff_t index)
-{
- return shmem_read_mapping_page_gfp(mapping, index,
- mapping_gfp_mask(mapping));
-}
-#endif
-#endif
-#endif
-
-#endif /* __BACKPORT_LINUX_SHMEM_FS_H */
diff --git a/backport/compat/compat-3.0.c b/backport/compat/compat-3.0.c
index 0a993d74..9841019f 100644
--- a/backport/compat/compat-3.0.c
+++ b/backport/compat/compat-3.0.c
@@ -12,32 +12,6 @@
#include <linux/compat.h>
#include <linux/if_ether.h>
-#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4))
-/* This pulls-in a lot of non-exported symbol backports
- * on kernels older than 2.6.32. There's no harm for not
- * making this available on kernels < 2.6.32. */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))
-#include <linux/pagemap.h>
-#include <linux/shmem_fs.h>
-
-/* This backports:
- *
- * commit d9d90e5eb70e09903dadff42099b6c948f814050
- * Author: Hugh Dickins <hughd@google.com>
- * Date: Mon Jun 27 16:18:04 2011 -0700
- *
- * tmpfs: add shmem_read_mapping_page_gfp
- */
-
-struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,
- pgoff_t index, gfp_t gfp)
-{
- return read_cache_page_gfp(mapping, index, gfp);
-}
-EXPORT_SYMBOL_GPL(shmem_read_mapping_page_gfp);
-#endif
-#endif
-
int mac_pton(const char *s, u8 *mac)
{
int i;