The patch titled
containersv10-example-cpu-accounting-subsystem-fix
has been removed from the -mm tree. Its filename was
containersv10-example-cpu-accounting-subsystem-fix.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: containersv10-example-cpu-accounting-subsystem-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: "Serge E. Hallyn" <serue@xxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Cc: Herbert Poetzl <herbert@xxxxxxxxxxxx>
Cc: Kirill Korotaev <dev@xxxxxxxxxx>
Cc: Paul Jackson <pj@xxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Cc: Srivatsa Vaddagiri <vatsa@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cpu_acct.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff -puN kernel/cpu_acct.c~containersv10-example-cpu-accounting-subsystem-fix kernel/cpu_acct.c
--- a/kernel/cpu_acct.c~containersv10-example-cpu-accounting-subsystem-fix
+++ a/kernel/cpu_acct.c
@@ -16,6 +16,8 @@
#include <linux/module.h>
#include <linux/container.h>
#include <linux/fs.h>
+#include <linux/rcupdate.h>
+
#include <asm/div64.h>
struct cpuacct {
@@ -50,7 +52,8 @@ static inline struct cpuacct *task_ca(st
#define INTERVAL (HZ * 10)
-static inline u64 next_interval_boundary(u64 now) {
+static inline u64 next_interval_boundary(u64 now)
+{
/* calculate the next interval boundary beyond the
* current time */
do_div(now, INTERVAL);
@@ -60,6 +63,7 @@ static inline u64 next_interval_boundary
static int cpuacct_create(struct container_subsys *ss, struct container *cont)
{
struct cpuacct *ca = kzalloc(sizeof(*ca), GFP_KERNEL);
+
if (!ca)
return -ENOMEM;
spin_lock_init(&ca->lock);
@@ -78,6 +82,7 @@ static void cpuacct_destroy(struct conta
static void cpuusage_update(struct cpuacct *ca)
{
u64 now = get_jiffies_64();
+
/* If we're not due for an update, return */
if (ca->next_interval_check > now)
return;
@@ -91,18 +96,16 @@ static void cpuusage_update(struct cpuac
} else {
/* If a steal takes the last interval time negative,
* then we just ignore it */
- if ((s64)ca->current_interval_time > 0) {
+ if ((s64)ca->current_interval_time > 0)
ca->last_interval_time = ca->current_interval_time;
- } else {
+ else
ca->last_interval_time = 0;
- }
ca->next_interval_check += INTERVAL;
}
ca->current_interval_time = 0;
}
-static u64 cpuusage_read(struct container *cont,
- struct cftype *cft)
+static u64 cpuusage_read(struct container *cont, struct cftype *cft)
{
struct cpuacct *ca = container_ca(cont);
u64 time;
@@ -118,8 +121,7 @@ static u64 cpuusage_read(struct containe
return time;
}
-static u64 load_read(struct container *cont,
- struct cftype *cft)
+static u64 load_read(struct container *cont, struct cftype *cft)
{
struct cpuacct *ca = container_ca(cont);
u64 time;
@@ -149,8 +151,7 @@ static struct cftype files[] = {
}
};
-static int cpuacct_populate(struct container_subsys *ss,
- struct container *cont)
+static int cpuacct_populate(struct container_subsys *ss, struct container *cont)
{
return container_add_files(cont, files, ARRAY_SIZE(files));
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
slow-down-printk-during-boot.patch
slow-down-printk-during-boot-fix-2.patch
git-acpi.patch
git-acpi-fix-git-rejects.patch
acpi-add-reboot-mechanism-fix.patch
working-3d-dri-intel-agpko-resume-for-i815-chip.patch
revert-gregkh-driver-block-device.patch
git-dvb.patch
adbhid-produce-all-capslock-key-events-fix.patch
git-kvm.patch
git-leds.patch
libata-add-irq_flags-to-struct-pata_platform_info-fix.patch
git-mtd.patch
mtd-potential-leak-in-rfd_ftl_add_mtd-fix.patch
e1000new-build-fix.patch
e1000new-build-fix-2.patch
serial-8250-handle-saving-the-clear-on-read-bits-from-the-lsr-fix.patch
add-blacklisting-capability-to-serial_pci-to-avoid-misdetection-fix.patch
revert-gregkh-pci-pci_bridge-device.patch
i386-add-support-for-picopower-irq-router.patch
try-parent-numa_node-at-first-before-using-default-v2-fix.patch
git-scsi-misc.patch
aacraid-rename-check_reset.patch
git-unionfs.patch
git-block-vs-git-unionfs.patch
x86_64-clean-up-apicid_to_node-declaration.patch
clockevents-fix-resume-logic-xen-fix.patch
ntp-move-the-cmos-update-code-into-ntpc.patch
x86_64-dynticks-disable-hpet_id_legsup-hpets.patch
mmconfig-validate-against-acpi-motherboard-resources.patch
git-xfs.patch
git-xfs-fixup.patch
git-kgdb-fixup-2.patch
vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch
sparsemem-record-when-a-section-has-a-valid-mem_map-fix.patch
fs-introduce-write_begin-write_end-and-perform_write-aops.patch
bias-the-location-of-pages-freed-for-min_free_kbytes-in-the-same-max_order_nr_pages-blocks.patch
maps2-move-the-page-walker-code-to-lib.patch
maps2-add-proc-pid-pagemap-interface.patch
maps2-make-proc-pid-smaps-optional-under-config_embeddedpatch-fix.patch
slub-slab-validation-move-tracking-information-alloc-outside-of-melstuff.patch
hugetlbfs-read-support-fix.patch
security-convert-lsm-into-a-static-interface-fix.patch
file-capabilities-clear-caps-cleanup-fix.patch
capabilityh-remove-include-of-currenth.patch
cache-pipe-buf-page-address-for-non-highmem-arch.patch
force-erroneous-inclusions-of-compiler-h-files-to-be-errors-fix.patch
driver-for-the-atmel-on-chip-ssc-on-at32ap-and-at91-fix.patch
add-kernel-notifierc-fix.patch
fs-9p-convc-error-path-fix.patch
loop-use-unlocked_ioctl.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-2.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-3.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-4.patch
writeback-fix-comment-use-helper-function.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-5.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-6.patch
writeback-fix-time-ordering-of-the-per-superblock-dirty-inode-lists-7.patch
revert-faster-ext2_clear_inode.patch
intel-iommu-pci-generic-helper-function.patch
intel-iommu-iova-allocation-and-management-routines.patch
intel-iommu-intel-iommu-driver.patch
intel-iommu-iommu-floppy-workaround.patch
revoke-wire-up-i386-system-calls.patch
revoke-vs-git-block.patch
containersv10-example-cpu-accounting-subsystem-fix.patch
containersv10-add-tasks-file-interface-fix.patch
containersv10-add-fork-exit-hooks-fix.patch
containersv10-add-container_clone-interface-fix.patch
containersv10-add-procfs-interface-fix.patch
containersv10-share-css_group-arrays-between-tasks-with-same-container-memberships-fix.patch
containersv10-simple-debug-info-subsystem-fix.patch
containersv10-simple-debug-info-subsystem-fix-2.patch
add-containerstats-v3-fix.patch
pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces-fix.patch
reiser4.patch
git-block-vs-reiser4.patch
page-owner-tracking-leak-detector.patch
check_dirty_inode_list.patch
alloc_pages-debug.patch
w1-build-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
