raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Support dummy vc-mem ioctl used by vcdbg"

Browse Source 
This reverts commit 22cb6e2620.
This commit is contained in:
popcornmix
2012-10-15 18:54:47 +01:00
parent d14d371938
commit fb241d04df
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-bcm2708/include/mach/vc_mem.h
View File

@@ -22,7 +22,6 @@
#define VC_MEM_IOC_MEM_PHYS_ADDR _IOR( VC_MEM_IOC_MAGIC, 0, unsigned long ) #define VC_MEM_IOC_MEM_PHYS_ADDR _IOR( VC_MEM_IOC_MAGIC, 0, unsigned long )
#define VC_MEM_IOC_MEM_SIZE _IOR( VC_MEM_IOC_MAGIC, 1, unsigned int ) #define VC_MEM_IOC_MEM_SIZE _IOR( VC_MEM_IOC_MAGIC, 1, unsigned int )
#define VC_MEM_IOC_MEM_BASE _IOR( VC_MEM_IOC_MAGIC, 2, unsigned int ) #define VC_MEM_IOC_MEM_BASE _IOR( VC_MEM_IOC_MAGIC, 2, unsigned int )
#define VC_MEM_IOC_MEM_LOAD _IOR( VC_MEM_IOC_MAGIC, 3, unsigned int )
#if defined( __KERNEL__ ) #if defined( __KERNEL__ )
#define VC_MEM_TO_ARM_ADDR_MASK 0x3FFFFFFF #define VC_MEM_TO_ARM_ADDR_MASK 0x3FFFFFFF

14
arch/arm/mach-bcm2708/vc_mem.c
View File

@@ -202,20 +202,6 @@ vc_mem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
LOG_DBG("%s: VC_MEM_IOC_MEM_BASE=%u", __func__, LOG_DBG("%s: VC_MEM_IOC_MEM_BASE=%u", __func__,
mm_vc_mem_base); mm_vc_mem_base);
if (copy_to_user((void *) arg, &mm_vc_mem_base,
sizeof (mm_vc_mem_base)) != 0) {
rc = -EFAULT;
}
break;
}
case VC_MEM_IOC_MEM_LOAD:
{
// Get the videocore memory base
vc_mem_get_base();
LOG_DBG("%s: VC_MEM_IOC_MEM_LOAD=%u", __func__,
mm_vc_mem_base);
if (copy_to_user((void *) arg, &mm_vc_mem_base, if (copy_to_user((void *) arg, &mm_vc_mem_base,
sizeof (mm_vc_mem_base)) != 0) { sizeof (mm_vc_mem_base)) != 0) {
rc = -EFAULT; rc = -EFAULT;