diff options
author | Robert Richter <robert.richter@amd.com> | 2008-11-24 08:21:03 -0500 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2008-12-10 08:20:07 -0500 |
commit | 9fa6812dbab9207f7af52c3d0417f1f9eb89c386 (patch) | |
tree | 7d6bef7921e1401cfcedf1b6527a07c280ad3c6a | |
parent | 8dbc50c322619eb821907e8dba75252f5378c712 (diff) |
x86/oprofile: reordering IBS code in op_model_amd.c
This is part of the cpu buffer rework.
Signed-off-by: Robert Richter <robert.richter@amd.com>
-rw-r--r-- | arch/x86/oprofile/op_model_amd.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c index f71bd218b488..8ff657b3ff89 100644 --- a/arch/x86/oprofile/op_model_amd.c +++ b/arch/x86/oprofile/op_model_amd.c | |||
@@ -376,18 +376,7 @@ static void op_amd_shutdown(struct op_msrs const * const msrs) | |||
376 | } | 376 | } |
377 | } | 377 | } |
378 | 378 | ||
379 | #ifndef CONFIG_OPROFILE_IBS | 379 | #ifdef CONFIG_OPROFILE_IBS |
380 | |||
381 | /* no IBS support */ | ||
382 | |||
383 | static int op_amd_init(struct oprofile_operations *ops) | ||
384 | { | ||
385 | return 0; | ||
386 | } | ||
387 | |||
388 | static void op_amd_exit(void) {} | ||
389 | |||
390 | #else | ||
391 | 380 | ||
392 | static u8 ibs_eilvt_off; | 381 | static u8 ibs_eilvt_off; |
393 | 382 | ||
@@ -531,7 +520,18 @@ static void op_amd_exit(void) | |||
531 | clear_ibs_nmi(); | 520 | clear_ibs_nmi(); |
532 | } | 521 | } |
533 | 522 | ||
534 | #endif | 523 | #else |
524 | |||
525 | /* no IBS support */ | ||
526 | |||
527 | static int op_amd_init(struct oprofile_operations *ops) | ||
528 | { | ||
529 | return 0; | ||
530 | } | ||
531 | |||
532 | static void op_amd_exit(void) {} | ||
533 | |||
534 | #endif /* CONFIG_OPROFILE_IBS */ | ||
535 | 535 | ||
536 | struct op_x86_model_spec const op_amd_spec = { | 536 | struct op_x86_model_spec const op_amd_spec = { |
537 | .init = op_amd_init, | 537 | .init = op_amd_init, |