← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to drivers/watchdog/hpwdt.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft, Ubuntu: 3.5.0-3.3
  • Date: 2012-07-03 09:23:14 UTC
  • Revision ID: package-import@ubuntu.com-20120703092314-wjaqz3coxptokmtl
Tags: 3.5.0-3.3
https://launchpad.net/bugs/1004535
https://launchpad.net/bugs/1006012
https://launchpad.net/bugs/1012800
https://launchpad.net/bugs/1013183
https://launchpad.net/bugs/1017017
https://launchpad.net/bugs/884652
[ Andy Whitcroft ]

* [Config] drop -pae from d-i configuration.
* rebase to Ubuntu-3.5.0-3.3

[ Ubuntu: 3.5.0-3.3 ]

* [Config] enable CONFIG_MEMTEST=y
  - LP: #1004535
* [Config] config-check: add support for a cut operation
* [Config] enforcer -- switch to cut where appropriate
* Rebase to v3.5-rc5
* [Config] Updateconfigs after rebase to v3.5-rc5
* SAUCE: ocfs2: Fix NULL pointer dereferrence in
  __ocfs2_change_file_space
  - LP: #1006012
* SAUCE: (drop after 3.5) drm/i915: ignore pipe select bit when checking
  for LVDS register initialization
  - LP: #1012800
* rebase to v3.5-rc5
  - LP: #1013183
  - LP: #1017017
  - LP: #884652

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/watchdog/hpwdt.c
146
146
}  __attribute__((packed));
147
147
 
148
148
static unsigned int hpwdt_nmi_decoding;
149
 
static unsigned int allow_kdump;
 
149
static unsigned int allow_kdump = 1;
150
150
static unsigned int is_icru;
151
151
static DEFINE_SPINLOCK(rom_lock);
152
152
static void *cru_rom_addr;
756
756
static void hpwdt_exit_nmi_decoding(void)
757
757
{
758
758
        unregister_nmi_handler(NMI_UNKNOWN, "hpwdt");
 
759
        unregister_nmi_handler(NMI_SERR, "hpwdt");
 
760
        unregister_nmi_handler(NMI_IO_CHECK, "hpwdt");
759
761
        if (cru_rom_addr)
760
762
                iounmap(cru_rom_addr);
761
763
}