Merge branch 'linus' into x86/urgent

Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 242bbf86c74..0a59fda5c09 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -69,6 +69,14 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                                 alrm.enabled ? "yes" : "no");
                 seq_printf(seq, "alrm_pending\t: %s\n",
                                 alrm.pending ? "yes" : "no");
+                seq_printf(seq, "update IRQ enabled\t: %s\n",
+                        (rtc->uie_rtctimer.enabled) ? "yes" : "no");
+                seq_printf(seq, "periodic IRQ enabled\t: %s\n",
+                        (rtc->pie_enabled) ? "yes" : "no");
+                seq_printf(seq, "periodic IRQ frequency\t: %d\n",
+                        rtc->irq_freq);
+                seq_printf(seq, "max user IRQ frequency\t: %d\n",
+                        rtc->max_user_freq);
         }
 
         seq_printf(seq, "24hr\t\t: yes\n");