Commit 360fda8b authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[PATCH] HPET copyrights, cleanup

This patch
	- adds copyright and license info
	- changes sense of mmap config option (setting option enables mmap
	  instead of disabling it, to avoid the double negative)
	- removes an #ifdef CONFIG_IA64 now that acpi_register_gsi()
	  is generic.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1ff0ce38
...@@ -976,14 +976,18 @@ config HPET_RTC_IRQ ...@@ -976,14 +976,18 @@ config HPET_RTC_IRQ
is assumed the platform called hpet_alloc with the RTC IRQ values for is assumed the platform called hpet_alloc with the RTC IRQ values for
the HPET timers. the HPET timers.
config HPET_NOMMAP config HPET_MMAP
bool "HPET - Control mmap capability." bool "Allow mmap of HPET"
default n default y
depends on HPET depends on HPET
help help
If you say Y here, then the mmap interface for the HPET driver returns ENOSYS. If you say Y here, user applications will be able to mmap
Some hardware implementations might not want all the memory in the page the the HPET registers.
HPET control registers reside to be exposed.
In some hardware implementations, the page containing HPET
registers may also contain other things that shouldn't be
exposed to the user. If this applies to your hardware,
say N here.
config MAX_RAW_DEVS config MAX_RAW_DEVS
int "Maximum number of RAW devices to support (1-8192)" int "Maximum number of RAW devices to support (1-8192)"
......
/* /*
* Intel & MS High Precision Event Timer Implementation. * Intel & MS High Precision Event Timer Implementation.
* Contributors: *
* Copyright (C) 2003 Intel Corporation
* Venki Pallipadi * Venki Pallipadi
* Bob Picco * (c) Copyright 2004 Hewlett-Packard Development Company, L.P.
* Bob Picco <robert.picco@hp.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/ */
#include <linux/config.h> #include <linux/config.h>
...@@ -250,9 +256,7 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait) ...@@ -250,9 +256,7 @@ static unsigned int hpet_poll(struct file *file, poll_table * wait)
static int hpet_mmap(struct file *file, struct vm_area_struct *vma) static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
{ {
#ifdef CONFIG_HPET_NOMMAP #ifdef CONFIG_HPET_MMAP
return -ENOSYS;
#else
struct hpet_dev *devp; struct hpet_dev *devp;
unsigned long addr; unsigned long addr;
...@@ -276,6 +280,8 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -276,6 +280,8 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
} }
return 0; return 0;
#else
return -ENOSYS;
#endif #endif
} }
...@@ -901,14 +907,10 @@ static acpi_status __init hpet_resources(struct acpi_resource *res, void *data) ...@@ -901,14 +907,10 @@ static acpi_status __init hpet_resources(struct acpi_resource *res, void *data)
hdp->hd_nirqs = irqp->number_of_interrupts; hdp->hd_nirqs = irqp->number_of_interrupts;
for (i = 0; i < hdp->hd_nirqs; i++) for (i = 0; i < hdp->hd_nirqs; i++)
#ifdef CONFIG_IA64
hdp->hd_irq[i] = hdp->hd_irq[i] =
acpi_register_gsi(irqp->interrupts[i], acpi_register_gsi(irqp->interrupts[i],
irqp->edge_level, irqp->edge_level,
irqp->active_high_low); irqp->active_high_low);
#else
hdp->hd_irq[i] = irqp->interrupts[i];
#endif
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment