Signed-off-by: Denis Cheng <[email protected]>
---
drivers/uio/Kconfig | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index b778ed7..d8ab7e6 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -1,8 +1,6 @@
-menu "Userspace I/O"
- depends on !S390
-
-config UIO
+menuconfig UIO
tristate "Userspace I/O drivers"
+ depends on !S390
default n
help
Enable this to allow the userspace driver core code to be
@@ -13,6 +11,8 @@ config UIO
If you don't know what to do here, say N.
+if UIO
+
config UIO_CIF
tristate "generic Hilscher CIF Card driver"
depends on UIO && PCI
@@ -26,4 +26,4 @@ config UIO_CIF
To compile this driver as a module, choose M here: the module
will be called uio_cif.
-endmenu
+endif
--
1.5.3.8
Signed-off-by: Denis Cheng <[email protected]>
---
drivers/uio/uio_cif.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
index 838bae4..4a5a97e 100644
--- a/drivers/uio/uio_cif.c
+++ b/drivers/uio/uio_cif.c
@@ -116,7 +116,7 @@ static void hilscher_pci_remove(struct pci_dev *dev)
kfree (info);
}
-static struct pci_device_id hilscher_pci_ids[] = {
+static struct pci_device_id hilscher_pci_ids[] __devinitdata = {
{
.vendor = PCI_VENDOR_ID_PLX,
.device = PCI_DEVICE_ID_PLX_9030,
--
1.5.3.8
Signed-off-by: Denis Cheng <[email protected]>
---
drivers/uio/uio.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index cc246fa..47e0c32 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -417,30 +417,27 @@ static void uio_vma_close(struct vm_area_struct *vma)
idev->vma_count--;
}
-static struct page *uio_vma_nopage(struct vm_area_struct *vma,
- unsigned long address, int *type)
+static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{
struct uio_device *idev = vma->vm_private_data;
- struct page* page = NOPAGE_SIGBUS;
int mi = uio_find_mem_index(vma);
if (mi < 0)
- return page;
+ return VM_FAULT_SIGBUS;
if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
- page = virt_to_page(idev->info->mem[mi].addr);
+ vmf->page = virt_to_page(idev->info->mem[mi].addr);
else
- page = vmalloc_to_page((void*)idev->info->mem[mi].addr);
- get_page(page);
- if (type)
- *type = VM_FAULT_MINOR;
- return page;
+ vmf->page = vmalloc_to_page((void *)idev->info->mem[mi].addr);
+ get_page(vmf->page);
+
+ return 0;
}
static struct vm_operations_struct uio_vm_ops = {
.open = uio_vma_open,
.close = uio_vma_close,
- .nopage = uio_vma_nopage,
+ .fault = uio_vma_fault,
};
static int uio_mmap_physical(struct vm_area_struct *vma)
--
1.5.3.8
On Saturday 02 February 2008 20:51, Denis Cheng wrote:
> Signed-off-by: Denis Cheng <[email protected]>
Thanks, but already patched in -mm.
> ---
> drivers/uio/uio.c | 19 ++++++++-----------
> 1 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
> index cc246fa..47e0c32 100644
> --- a/drivers/uio/uio.c
> +++ b/drivers/uio/uio.c
> @@ -417,30 +417,27 @@ static void uio_vma_close(struct vm_area_struct *vma)
> idev->vma_count--;
> }
>
> -static struct page *uio_vma_nopage(struct vm_area_struct *vma,
> - unsigned long address, int *type)
> +static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
> {
> struct uio_device *idev = vma->vm_private_data;
> - struct page* page = NOPAGE_SIGBUS;
>
> int mi = uio_find_mem_index(vma);
> if (mi < 0)
> - return page;
> + return VM_FAULT_SIGBUS;
>
> if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL)
> - page = virt_to_page(idev->info->mem[mi].addr);
> + vmf->page = virt_to_page(idev->info->mem[mi].addr);
> else
> - page = vmalloc_to_page((void*)idev->info->mem[mi].addr);
> - get_page(page);
> - if (type)
> - *type = VM_FAULT_MINOR;
> - return page;
> + vmf->page = vmalloc_to_page((void *)idev->info->mem[mi].addr);
> + get_page(vmf->page);
> +
> + return 0;
> }
>
> static struct vm_operations_struct uio_vm_ops = {
> .open = uio_vma_open,
> .close = uio_vma_close,
> - .nopage = uio_vma_nopage,
> + .fault = uio_vma_fault,
> };
>
> static int uio_mmap_physical(struct vm_area_struct *vma)
Am Sat, 2 Feb 2008 17:51:35 +0800
schrieb Denis Cheng <[email protected]>:
Agreed.
> Signed-off-by: Denis Cheng <[email protected]>
Signed-off-by: Hans J. Koch <[email protected]>
> ---
> drivers/uio/Kconfig | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
> index b778ed7..d8ab7e6 100644
> --- a/drivers/uio/Kconfig
> +++ b/drivers/uio/Kconfig
> @@ -1,8 +1,6 @@
> -menu "Userspace I/O"
> - depends on !S390
> -
> -config UIO
> +menuconfig UIO
> tristate "Userspace I/O drivers"
> + depends on !S390
> default n
> help
> Enable this to allow the userspace driver core code to be
> @@ -13,6 +11,8 @@ config UIO
>
> If you don't know what to do here, say N.
>
> +if UIO
> +
> config UIO_CIF
> tristate "generic Hilscher CIF Card driver"
> depends on UIO && PCI
> @@ -26,4 +26,4 @@ config UIO_CIF
> To compile this driver as a module, choose M here: the
> module will be called uio_cif.
>
> -endmenu
> +endif
Am Sat, 2 Feb 2008 17:51:36 +0800
schrieb Denis Cheng <[email protected]>:
Makes sense.
> Signed-off-by: Denis Cheng <[email protected]>
Signed-off-by: Hans J. Koch <[email protected]>
> ---
> drivers/uio/uio_cif.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c
> index 838bae4..4a5a97e 100644
> --- a/drivers/uio/uio_cif.c
> +++ b/drivers/uio/uio_cif.c
> @@ -116,7 +116,7 @@ static void hilscher_pci_remove(struct pci_dev
> *dev) kfree (info);
> }
>
> -static struct pci_device_id hilscher_pci_ids[] = {
> +static struct pci_device_id hilscher_pci_ids[] __devinitdata = {
> {
> .vendor = PCI_VENDOR_ID_PLX,
> .device = PCI_DEVICE_ID_PLX_9030,