Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 288038
b: refs/heads/master
c: 4043b88
h: refs/heads/master
v: v3
  • Loading branch information
Steven Whitehouse committed Feb 28, 2012
1 parent 38d7eff commit 0890c4e
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 54 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d5a74afd08738af84d51c353ac3ac200b06c51d7
refs/heads/master: 4043b886b0740ded65f633fc4b7225d624c7e658
3 changes: 1 addition & 2 deletions trunk/arch/arm/mach-omap2/mailbox.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,7 @@ static void __exit omap2_mbox_exit(void)
platform_driver_unregister(&omap2_mbox_driver);
}

/* must be ready before omap3isp is probed */
subsys_initcall(omap2_mbox_init);
module_init(omap2_mbox_init);
module_exit(omap2_mbox_exit);

MODULE_LICENSE("GPL v2");
Expand Down
59 changes: 14 additions & 45 deletions trunk/drivers/iommu/omap-iommu-debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ static ssize_t debug_read_ver(struct file *file, char __user *userbuf,
static ssize_t debug_read_regs(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = dev_to_omap_iommu(dev);
struct omap_iommu *obj = file->private_data;
char *p, *buf;
ssize_t bytes;

Expand All @@ -68,8 +67,7 @@ static ssize_t debug_read_regs(struct file *file, char __user *userbuf,
static ssize_t debug_read_tlb(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = dev_to_omap_iommu(dev);
struct omap_iommu *obj = file->private_data;
char *p, *buf;
ssize_t bytes, rest;

Expand Down Expand Up @@ -99,8 +97,7 @@ static ssize_t debug_write_pagetable(struct file *file,
struct iotlb_entry e;
struct cr_regs cr;
int err;
struct device *dev = file->private_data;
struct omap_iommu *obj = dev_to_omap_iommu(dev);
struct omap_iommu *obj = file->private_data;
char buf[MAXCOLUMN], *p = buf;

count = min(count, sizeof(buf));
Expand Down Expand Up @@ -187,8 +184,7 @@ static ssize_t dump_ioptable(struct omap_iommu *obj, char *buf, ssize_t len)
static ssize_t debug_read_pagetable(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = dev_to_omap_iommu(dev);
struct omap_iommu *obj = file->private_data;
char *p, *buf;
size_t bytes;

Expand Down Expand Up @@ -216,8 +212,7 @@ static ssize_t debug_read_pagetable(struct file *file, char __user *userbuf,
static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = dev_to_omap_iommu(dev);
struct omap_iommu *obj = file->private_data;
char *p, *buf;
struct iovm_struct *tmp;
int uninitialized_var(i);
Expand Down Expand Up @@ -259,7 +254,7 @@ static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = file->private_data;
char *p, *buf;
struct iovm_struct *area;
ssize_t bytes;
Expand All @@ -273,8 +268,8 @@ static ssize_t debug_read_mem(struct file *file, char __user *userbuf,

mutex_lock(&iommu_debug_lock);

area = omap_find_iovm_area(dev, (u32)ppos);
if (!area) {
area = omap_find_iovm_area(obj, (u32)ppos);
if (IS_ERR(area)) {
bytes = -EINVAL;
goto err_out;
}
Expand All @@ -292,7 +287,7 @@ static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,
size_t count, loff_t *ppos)
{
struct device *dev = file->private_data;
struct omap_iommu *obj = file->private_data;
struct iovm_struct *area;
char *p, *buf;

Expand All @@ -310,8 +305,8 @@ static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,
goto err_out;
}

area = omap_find_iovm_area(dev, (u32)ppos);
if (!area) {
area = omap_find_iovm_area(obj, (u32)ppos);
if (IS_ERR(area)) {
count = -EINVAL;
goto err_out;
}
Expand Down Expand Up @@ -355,7 +350,7 @@ DEBUG_FOPS(mem);
{ \
struct dentry *dent; \
dent = debugfs_create_file(#attr, mode, parent, \
dev, &debug_##attr##_fops); \
obj, &debug_##attr##_fops); \
if (!dent) \
return -ENOMEM; \
}
Expand All @@ -367,29 +362,20 @@ static int iommu_debug_register(struct device *dev, void *data)
{
struct platform_device *pdev = to_platform_device(dev);
struct omap_iommu *obj = platform_get_drvdata(pdev);
struct omap_iommu_arch_data *arch_data;
struct dentry *d, *parent;

if (!obj || !obj->dev)
return -EINVAL;

arch_data = kzalloc(sizeof(*arch_data), GFP_KERNEL);
if (!arch_data)
return -ENOMEM;

arch_data->iommu_dev = obj;

dev->archdata.iommu = arch_data;

d = debugfs_create_dir(obj->name, iommu_debug_root);
if (!d)
goto nomem;
return -ENOMEM;
parent = d;

d = debugfs_create_u8("nr_tlb_entries", 400, parent,
(u8 *)&obj->nr_tlb_entries);
if (!d)
goto nomem;
return -ENOMEM;

DEBUG_ADD_FILE_RO(ver);
DEBUG_ADD_FILE_RO(regs);
Expand All @@ -398,22 +384,6 @@ static int iommu_debug_register(struct device *dev, void *data)
DEBUG_ADD_FILE_RO(mmap);
DEBUG_ADD_FILE(mem);

return 0;

nomem:
kfree(arch_data);
return -ENOMEM;
}

static int iommu_debug_unregister(struct device *dev, void *data)
{
if (!dev->archdata.iommu)
return 0;

kfree(dev->archdata.iommu);

dev->archdata.iommu = NULL;

return 0;
}

Expand Down Expand Up @@ -441,7 +411,6 @@ module_init(iommu_debug_init)
static void __exit iommu_debugfs_exit(void)
{
debugfs_remove_recursive(iommu_debug_root);
omap_foreach_iommu_device(NULL, iommu_debug_unregister);
}
module_exit(iommu_debugfs_exit)

Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/iommu/omap-iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1223,8 +1223,7 @@ static int __init omap_iommu_init(void)

return platform_driver_register(&omap_iommu_driver);
}
/* must be ready before omap3isp is probed */
subsys_initcall(omap_iommu_init);
module_init(omap_iommu_init);

static void __exit omap_iommu_exit(void)
{
Expand Down
14 changes: 10 additions & 4 deletions trunk/fs/gfs2/glock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,19 @@ void gfs2_glock_add_to_lru(struct gfs2_glock *gl)
spin_unlock(&lru_lock);
}

static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)
static void __gfs2_glock_remove_from_lru(struct gfs2_glock *gl)
{
spin_lock(&lru_lock);
if (!list_empty(&gl->gl_lru)) {
list_del_init(&gl->gl_lru);
atomic_dec(&lru_count);
clear_bit(GLF_LRU, &gl->gl_flags);
}
}

static void gfs2_glock_remove_from_lru(struct gfs2_glock *gl)
{
spin_lock(&lru_lock);
__gfs2_glock_remove_from_lru(gl);
spin_unlock(&lru_lock);
}

Expand Down Expand Up @@ -217,11 +222,12 @@ void gfs2_glock_put(struct gfs2_glock *gl)
struct gfs2_sbd *sdp = gl->gl_sbd;
struct address_space *mapping = gfs2_glock2aspace(gl);

if (atomic_dec_and_test(&gl->gl_ref)) {
if (atomic_dec_and_lock(&gl->gl_ref, &lru_lock)) {
__gfs2_glock_remove_from_lru(gl);
spin_unlock(&lru_lock);
spin_lock_bucket(gl->gl_hash);
hlist_bl_del_rcu(&gl->gl_list);
spin_unlock_bucket(gl->gl_hash);
gfs2_glock_remove_from_lru(gl);
GLOCK_BUG_ON(gl, !list_empty(&gl->gl_holders));
GLOCK_BUG_ON(gl, mapping && mapping->nrpages);
trace_gfs2_glock_put(gl);
Expand Down

0 comments on commit 0890c4e

Please sign in to comment.