diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /kernel/audit.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'kernel/audit.c')
| -rw-r--r-- | kernel/audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c index 7dfac7031bd7..82443fb433ef 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
| @@ -818,7 +818,7 @@ err: | |||
| 818 | */ | 818 | */ |
| 819 | unsigned int audit_serial(void) | 819 | unsigned int audit_serial(void) |
| 820 | { | 820 | { |
| 821 | static spinlock_t serial_lock = SPIN_LOCK_UNLOCKED; | 821 | static DEFINE_SPINLOCK(serial_lock); |
| 822 | static unsigned int serial = 0; | 822 | static unsigned int serial = 0; |
| 823 | 823 | ||
| 824 | unsigned long flags; | 824 | unsigned long flags; |