The patch titled
drivers/char/drm/drm_memory.c: possible cleanups
has been removed from the -mm tree. Its filename is
drivers-char-drm-drm_memoryc-possible-cleanups.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Adrian Bunk <bunk@xxxxxxxxx>
- #if 0 the following unused global function:
- drm_ioremap_nocache()
- make the following needlessly global functions static:
- agp_remap()
- drm_lookup_map()
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/drm/drmP.h | 4 ++--
drivers/char/drm/drm_memory.c | 25 +++++++++++++++++++++----
drivers/char/drm/drm_memory.h | 24 ------------------------
drivers/char/drm/drm_memory_debug.h | 2 ++
4 files changed, 25 insertions(+), 30 deletions(-)
diff -puN drivers/char/drm/drm_memory.c~drivers-char-drm-drm_memoryc-possible-cleanups drivers/char/drm/drm_memory.c
--- devel/drivers/char/drm/drm_memory.c~drivers-char-drm-drm_memoryc-possible-cleanups 2006-04-09 23:22:07.000000000 -0700
+++ devel-akpm/drivers/char/drm/drm_memory.c 2006-04-09 23:22:07.000000000 -0700
@@ -83,8 +83,8 @@ void *drm_realloc(void *oldpt, size_t ol
/*
* Find the drm_map that covers the range [offset, offset+size).
*/
-drm_map_t *drm_lookup_map(unsigned long offset,
- unsigned long size, drm_device_t * dev)
+static drm_map_t *drm_lookup_map(unsigned long offset,
+ unsigned long size, drm_device_t * dev)
{
struct list_head *list;
drm_map_list_t *r_list;
@@ -102,8 +102,8 @@ drm_map_t *drm_lookup_map(unsigned long
return NULL;
}
-void *agp_remap(unsigned long offset, unsigned long size,
- drm_device_t * dev)
+static void *agp_remap(unsigned long offset, unsigned long size,
+ drm_device_t * dev)
{
unsigned long *phys_addr_map, i, num_pages =
PAGE_ALIGN(size) / PAGE_SIZE;
@@ -168,6 +168,21 @@ int drm_unbind_agp(DRM_AGP_MEM * handle)
{
return drm_agp_unbind_memory(handle);
}
+
+#else /* __OS_HAS_AGP */
+
+static inline drm_map_t *drm_lookup_map(unsigned long offset,
+ unsigned long size, drm_device_t * dev)
+{
+ return NULL;
+}
+
+static inline void *agp_remap(unsigned long offset, unsigned long size,
+ drm_device_t * dev)
+{
+ return NULL;
+}
+
#endif /* agp */
void *drm_ioremap(unsigned long offset, unsigned long size,
@@ -183,6 +198,7 @@ void *drm_ioremap(unsigned long offset,
}
EXPORT_SYMBOL(drm_ioremap);
+#if 0
void *drm_ioremap_nocache(unsigned long offset,
unsigned long size, drm_device_t * dev)
{
@@ -194,6 +210,7 @@ void *drm_ioremap_nocache(unsigned long
}
return ioremap_nocache(offset, size);
}
+#endif /* 0 */
void drm_ioremapfree(void *pt, unsigned long size,
drm_device_t * dev)
diff -puN drivers/char/drm/drm_memory_debug.h~drivers-char-drm-drm_memoryc-possible-cleanups drivers/char/drm/drm_memory_debug.h
--- devel/drivers/char/drm/drm_memory_debug.h~drivers-char-drm-drm_memoryc-possible-cleanups 2006-04-09 23:22:07.000000000 -0700
+++ devel-akpm/drivers/char/drm/drm_memory_debug.h 2006-04-09 23:22:07.000000000 -0700
@@ -229,6 +229,7 @@ void *drm_ioremap (unsigned long offset,
return pt;
}
+#if 0
void *drm_ioremap_nocache (unsigned long offset, unsigned long size,
drm_device_t * dev) {
void *pt;
@@ -251,6 +252,7 @@ void *drm_ioremap_nocache (unsigned long
spin_unlock(&drm_mem_lock);
return pt;
}
+#endif /* 0 */
void drm_ioremapfree (void *pt, unsigned long size, drm_device_t * dev) {
int alloc_count;
diff -puN drivers/char/drm/drm_memory.h~drivers-char-drm-drm_memoryc-possible-cleanups drivers/char/drm/drm_memory.h
--- devel/drivers/char/drm/drm_memory.h~drivers-char-drm-drm_memoryc-possible-cleanups 2006-04-09 23:22:07.000000000 -0700
+++ devel-akpm/drivers/char/drm/drm_memory.h 2006-04-09 23:22:07.000000000 -0700
@@ -57,15 +57,6 @@
# endif
#endif
-/*
- * Find the drm_map that covers the range [offset, offset+size).
- */
-drm_map_t *drm_lookup_map(unsigned long offset,
- unsigned long size, drm_device_t * dev);
-
-void *agp_remap(unsigned long offset, unsigned long size,
- drm_device_t * dev);
-
static inline unsigned long drm_follow_page(void *vaddr)
{
pgd_t *pgd = pgd_offset_k((unsigned long)vaddr);
@@ -77,18 +68,6 @@ static inline unsigned long drm_follow_p
#else /* __OS_HAS_AGP */
-static inline drm_map_t *drm_lookup_map(unsigned long offset,
- unsigned long size, drm_device_t * dev)
-{
- return NULL;
-}
-
-static inline void *agp_remap(unsigned long offset, unsigned long size,
- drm_device_t * dev)
-{
- return NULL;
-}
-
static inline unsigned long drm_follow_page(void *vaddr)
{
return 0;
@@ -99,8 +78,5 @@ static inline unsigned long drm_follow_p
void *drm_ioremap(unsigned long offset, unsigned long size,
drm_device_t * dev);
-void *drm_ioremap_nocache(unsigned long offset,
- unsigned long size, drm_device_t * dev);
-
void drm_ioremapfree(void *pt, unsigned long size,
drm_device_t * dev);
diff -puN drivers/char/drm/drmP.h~drivers-char-drm-drm_memoryc-possible-cleanups drivers/char/drm/drmP.h
--- devel/drivers/char/drm/drmP.h~drivers-char-drm-drm_memoryc-possible-cleanups 2006-04-09 23:22:07.000000000 -0700
+++ devel-akpm/drivers/char/drm/drmP.h 2006-04-09 23:22:07.000000000 -0700
@@ -815,8 +815,6 @@ extern int drm_mem_info(char *buf, char
extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area);
extern void *drm_ioremap(unsigned long offset, unsigned long size,
drm_device_t * dev);
-extern void *drm_ioremap_nocache(unsigned long offset, unsigned long size,
- drm_device_t * dev);
extern void drm_ioremapfree(void *pt, unsigned long size, drm_device_t * dev);
extern DRM_AGP_MEM *drm_alloc_agp(drm_device_t * dev, int pages, u32 type);
@@ -1022,11 +1020,13 @@ static __inline__ void drm_core_ioremap(
map->handle = drm_ioremap(map->offset, map->size, dev);
}
+#if 0
static __inline__ void drm_core_ioremap_nocache(struct drm_map *map,
struct drm_device *dev)
{
map->handle = drm_ioremap_nocache(map->offset, map->size, dev);
}
+#endif /* 0 */
static __inline__ void drm_core_ioremapfree(struct drm_map *map,
struct drm_device *dev)
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
git-acpi.patch
git-dvb.patch
drivers-media-video-bt866c-small-fixes-2.patch
gregkh-i2c-w1-cleanups-fix.patch
git-intelfb.patch
nfs-make-2-functions-static.patch
fix-nfs-proc_fs=n-compile-error.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
scsi-megaraid-megaraid_mmc-fix-a-null-pointer-dereference.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
ieee80211_wxc-remove-dead-code.patch
bcm43xx_phyc-fix-a-memory-leak.patch
memory_hotplugh-cleanup.patch
hugetlbfs-add-kconfig-help-text.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
drivers-acpi-busc-make-struct-acpi_sci_dir-static.patch
remove-fs-jffs2-ioctlc.patch
update-obsolete_oss_driver-schedule-and-dependencies.patch
make-the-oss-sound_via82cxxx-option-available-again.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
time-i386-clocksource-drivers.patch
dlm-recovery.patch
dlm-build.patch
dlm-cleanup-unused-functions.patch
dlm-include-own-headers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
remove-the-obsolete-idepci_flag_force_pdc.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
x86_64-unexport-ia32_sys_call_table.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
