Skip to content

Commit

Permalink
xen-pciback: Add name prefix to global 'permissive' variable
Browse files Browse the repository at this point in the history
The variable for the 'permissive' module parameter used to be static
but was recently changed to be extern.  This puts it in the kernel
global namespace if the driver is built-in, so its name should begin
with a prefix identifying the driver.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Fixes: af6fc85 ("xen-pciback: limit guest control of command register")
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
  • Loading branch information
Ben Hutchings authored and David Vrabel committed Apr 29, 2015
1 parent 2b953a5 commit 8014bcc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions drivers/xen/xen-pciback/conf_space.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#include "conf_space.h"
#include "conf_space_quirks.h"

bool permissive;
module_param(permissive, bool, 0644);
bool xen_pcibk_permissive;
module_param_named(permissive, xen_pcibk_permissive, bool, 0644);

/* This is where xen_pcibk_read_config_byte, xen_pcibk_read_config_word,
* xen_pcibk_write_config_word, and xen_pcibk_write_config_byte are created. */
Expand Down Expand Up @@ -262,7 +262,7 @@ int xen_pcibk_config_write(struct pci_dev *dev, int offset, int size, u32 value)
* This means that some fields may still be read-only because
* they have entries in the config_field list that intercept
* the write and do nothing. */
if (dev_data->permissive || permissive) {
if (dev_data->permissive || xen_pcibk_permissive) {
switch (size) {
case 1:
err = pci_write_config_byte(dev, offset,
Expand Down
2 changes: 1 addition & 1 deletion drivers/xen/xen-pciback/conf_space.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct config_field_entry {
void *data;
};

extern bool permissive;
extern bool xen_pcibk_permissive;

#define OFFSET(cfg_entry) ((cfg_entry)->base_offset+(cfg_entry)->field->offset)

Expand Down
2 changes: 1 addition & 1 deletion drivers/xen/xen-pciback/conf_space_header.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data)

cmd->val = value;

if (!permissive && (!dev_data || !dev_data->permissive))
if (!xen_pcibk_permissive && (!dev_data || !dev_data->permissive))
return 0;

/* Only allow the guest to control certain bits. */
Expand Down

0 comments on commit 8014bcc

Please sign in to comment.