300-wdt_compile_fix.patch 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. --- a/Embedded/src/WDT/iwdt.c
  2. +++ b/Embedded/src/WDT/iwdt.c
  3. @@ -180,19 +180,19 @@ MODULE_PARM_DESC(wdt_scale, "Intel WDT s
  4. module_param(wdt_intr_type, byte, WDT_INT_TYPE_IRQ);
  5. MODULE_PARM_DESC(wdt_intr_type, "Intel WDT interrupt type (default SERIRQ).");
  6. -module_param(wdt_margin1, uint, TIMER_MARGIN);
  7. +module_param(wdt_margin1, uint, 0);
  8. MODULE_PARM_DESC(wdt_margin1, "First stage Intel WDT timeout in steps of 1 ms by default.");
  9. -module_param(wdt_margin2, uint, TIMER_MARGIN);
  10. +module_param(wdt_margin2, uint, 0);
  11. MODULE_PARM_DESC(wdt_margin2, "Second stage Intel WDT timeout in steps of 1 ms by default.");
  12. module_param(nowayout, int, 0);
  13. MODULE_PARM_DESC(nowayout, "Intel WDT can't be stopped once started (default=0)");
  14. -module_param(wdt_index_port, int, 0x4E);
  15. +module_param(wdt_index_port, int, 0);
  16. MODULE_PARM_DESC(wdt_index_port, "WDT Index Port (default 0x4e)");
  17. -module_param(wdt_data_port, int, 0x4E);
  18. +module_param(wdt_data_port, int, 0);
  19. MODULE_PARM_DESC(wdt_data_port, "WDT Data Port (default 0x4f)");
  20. static int wdt_get_iobase(struct pci_dev *dev, u16 *iobase, int *irq);
  21. @@ -218,7 +218,7 @@ static ssize_t wdt_write(struct file *fi
  22. size_t count, loff_t * pos);
  23. static int wdt_ioctl(struct inode *inode, struct file *file,
  24. unsigned int cmd, unsigned long arg);
  25. -static irqreturn_t wdt_isr(int irq, void *dev_id, struct pt_regs *regs);
  26. +static irqreturn_t wdt_isr(int irq, void *dev_id);
  27. static void __exit wdt_cleanup(void);
  28. static int __init wdt_init(void);
  29. static int __init wdt_init_one(struct pci_dev *dev,
  30. @@ -255,7 +255,7 @@ static struct pci_driver wdt_driver = {
  31. name: "iwdt",
  32. id_table: lpc_pci_tbl,
  33. probe: wdt_init_one,
  34. - remove: __devexit(wdt_remove_one),
  35. + remove: __devexit_p(wdt_remove_one),
  36. suspend: wdt_pci_suspend,
  37. resume: wdt_pci_resume,
  38. };
  39. @@ -1393,12 +1393,12 @@ static int wdt_ioctl(struct inode *inode
  40. /*
  41. * Function Name: wdt_isr()
  42. - * Parameter: int irq - irq number, void *dev_id, struct pt_regs *regs
  43. + * Parameter: int irq - irq number, void *dev_id
  44. * Return Value:: IRQ_NONE - if the interrupt is not for wdt.
  45. * IRQ_HANDLED - if it is for wdt.
  46. * Description: This is the interrupt service routine of the WDT.
  47. */
  48. -static irqreturn_t wdt_isr(int irq, void *dev_id, struct pt_regs *regs)
  49. +static irqreturn_t wdt_isr(int irq, void *dev_id)
  50. {
  51. u8 val;