litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Peter Zijlstra <a.p.zijlstra@chello.nl>	2011-05-30 10:48:06 -0400
committer	Ingo Molnar <mingo@elte.hu>	2011-05-31 08:20:25 -0400
commit	74c355fbdfedd3820046dba4f537876cea54c207 (patch)
tree	3a07851e63f5eb9a233286c6683f7e8c7d9d61a2 /mm/mempool.c
parent	89e1be50c68eb5e58b873dce87bbac627ee18d1f (diff)

perf, cgroups: Fix up for new API

Ben changed the cgroup API in commit f780bdb7c1c (cgroups: add per-thread subsystem callbacks) in an incompatible way, but forgot to convert the perf cgroup bits. Avoid compile warnings and runtime splats and convert perf too ;-) Acked-by: Ben Blum <bblum@andrew.cmu.edu> Cc: Stephane Eranian <eranian@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1306767651.1200.2990.camel@twins Signed-off-by: Ingo Molnar <mingo@elte.hu>

Diffstat (limited to 'mm/mempool.c')

0 files changed, 0 insertions, 0 deletions

#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/suspend.h> #include <linux/bcd.h> #include <asm/uaccess.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> #ifdef CONFIG_X86 #include <linux/mc146818rtc.h> #endif #include "sleep.h" #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("sleep") #ifdef CONFIG_ACPI_SLEEP_PROC_SLEEP static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset) { int i; ACPI_FUNCTION_TRACE("acpi_system_sleep_seq_show"); for (i = 0; i <= ACPI_STATE_S5; i++) { if (sleep_states[i]) { seq_printf(seq, "S%d ", i); } } seq_puts(seq, "\n"); return 0; } static int acpi_system_sleep_open_fs(struct inode *inode, struct file *file) { return single_open(file, acpi_system_sleep_seq_show, PDE(inode)->data); } static ssize_t acpi_system_write_sleep(struct file *file, const char __user * buffer, size_t count, loff_t * ppos) { char str[12]; u32 state = 0; int error = 0; if (count > sizeof(str) - 1) goto Done; memset(str, 0, sizeof(str)); if (copy_from_user(str, buffer, count)) return -EFAULT; /* Check for S4 bios request */ if (!strcmp(str, "4b")) { error = acpi_suspend(4); goto Done; } state = simple_strtoul(str, NULL, 0); #ifdef CONFIG_SOFTWARE_SUSPEND if (state == 4) { error = software_suspend(); goto Done; } #endif error = acpi_suspend(state); Done: return error ? error : count; } #endif /* CONFIG_ACPI_SLEEP_PROC_SLEEP */ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset) { u32 sec, min, hr; u32 day, mo, yr, cent = 0; unsigned char rtc_control = 0; unsigned long flags; ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show"); spin_lock_irqsave(&rtc_lock, flags); sec = CMOS_READ(RTC_SECONDS_ALARM); min = CMOS_READ(RTC_MINUTES_ALARM); hr = CMOS_READ(RTC_HOURS_ALARM); rtc_control = CMOS_READ(RTC_CONTROL); /* If we ever get an FACP with proper values... */ if (acpi_gbl_FADT.day_alarm) /* ACPI spec: only low 6 its should be cared */ day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F; else day = CMOS_READ(RTC_DAY_OF_MONTH); if (acpi_gbl_FADT.month_alarm) mo = CMOS_READ(acpi_gbl_FADT.month_alarm); else mo = CMOS_READ(RTC_MONTH); if (acpi_gbl_FADT.century) cent = CMOS_READ(acpi_gbl_FADT.century); yr = CMOS_READ(RTC_YEAR); spin_unlock_irqrestore(&rtc_lock, flags); if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { BCD_TO_BIN(sec); BCD_TO_BIN(min); BCD_TO_BIN(hr); BCD_TO_BIN(day); BCD_TO_BIN(mo); BCD_TO_BIN(yr); BCD_TO_BIN(cent); } /* we're trusting the FADT (see above) */ if (!acpi_gbl_FADT.century) /* If we're not trusting the FADT, we should at least make it * right for _this_ century... ehm, what is _this_ century? * * TBD: * ASAP: find piece of code in the kernel, e.g. star tracker driver, * which we can trust to determine the century correctly. Atom * watch driver would be nice, too... * * if that has not happened, change for first release in 2050: * if (yr<50) * yr += 2100; * else * yr += 2000; // current line of code * * if that has not happened either, please do on 2099/12/31:23:59:59 * s/2000/2100 * */ yr += 2000; else yr += cent * 100; seq_printf(seq, "%4.4u-", yr); (mo > 12) ? seq_puts(seq, "**-") : seq_printf(seq, "%2.2u-", mo); (day > 31) ? seq_puts(seq, "** ") : seq_printf(seq, "%2.2u ", day); (hr > 23) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", hr); (min > 59) ? seq_puts(seq, "**:") : seq_printf(seq, "%2.2u:", min); (sec > 59) ? seq_puts(seq, "**\n") : seq_printf(seq, "%2.2u\n", sec); return 0; } static int acpi_system_alarm_open_fs(struct inode *inode, struct file *file) { return single_open(file, acpi_system_alarm_seq_show, PDE(inode)->data); } static int get_date_field(char **p, u32 * value) { char *next = NULL; char *string_end = NULL; int result = -EINVAL; /* * Try to find delimeter, only to insert null. The end of the * string won't have one, but is still valid. */ next = strpbrk(*p, "- :"); if (next) *next++ = '\0'; *value = simple_strtoul(*p, &string_end, 10); /* Signal success if we got a good digit */ if (string_end != *p) result = 0; if (next) *p = next; return result; } static ssize_t acpi_system_write_alarm(struct file *file, const char __user * buffer, size_t count, loff_t * ppos) { int result = 0; char alarm_string[30] = { '\0' }; char *p = alarm_string; u32 sec, min, hr, day, mo, yr; int adjust = 0; unsigned char rtc_control = 0; ACPI_FUNCTION_TRACE("acpi_system_write_alarm"); if (count > sizeof(alarm_string) - 1) return_VALUE(-EINVAL); if (copy_from_user(alarm_string, buffer, count)) return_VALUE(-EFAULT); alarm_string[count] = '\0'; /* check for time adjustment */ if (alarm_string[0] == '+') { p++; adjust = 1; } if ((result = get_date_field(&p, &yr))) goto end; if ((result = get_date_field(&p, &mo))) goto end; if ((result = get_date_field(&p, &day))) goto end; if ((result = get_date_field(&p, &hr))) goto end; if ((result = get_date_field(&p, &min))) goto end; if ((result = get_date_field(&p, &sec))) goto end; if (sec > 59) { min += 1; sec -= 60; } if (min > 59) { hr += 1; min -= 60; } if (hr > 23) { day += 1; hr -= 24; } if (day > 31) { mo += 1; day -= 31; } if (mo > 12) { yr += 1; mo -= 12; } spin_lock_irq(&rtc_lock); rtc_control = CMOS_READ(RTC_CONTROL); if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { BIN_TO_BCD(yr); BIN_TO_BCD(mo); BIN_TO_BCD(day); BIN_TO_BCD(hr); BIN_TO_BCD(min); BIN_TO_BCD(sec); }


context:
space:
mode: