Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 211932
b: refs/heads/master
c: cd254f2
h: refs/heads/master
v: v3
  • Loading branch information
Robert Richter committed Oct 15, 2010
1 parent ea06512 commit 2a26086
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3b3a9b63f2deacfd59137e3781211d21a568ca9
refs/heads/master: cd254f295248c98b62ea824f361e10d80a081fe7
8 changes: 6 additions & 2 deletions trunk/drivers/oprofile/oprofile_perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ static void oprofile_perf_stop(void)
}

#ifdef CONFIG_PM

static int oprofile_perf_suspend(struct platform_device *dev, pm_message_t state)
{
mutex_lock(&oprofile_perf_mutex);
Expand Down Expand Up @@ -241,9 +242,12 @@ static void exit_driverfs(void)
platform_device_unregister(oprofile_pdev);
platform_driver_unregister(&oprofile_driver);
}

#else
static int __init init_driverfs(void) { return 0; }
#define exit_driverfs() do { } while (0)

static inline int init_driverfs(void) { return 0; }
static inline void exit_driverfs(void) { }

#endif /* CONFIG_PM */

void oprofile_perf_exit(void)
Expand Down

0 comments on commit 2a26086

Please sign in to comment.